meson: add missing explicit dependency on nlohmann_json
Without this, the Meson setup won't bail out if nlohmann_json is missing, leading to subpar DX (and maybe worse, but I'm not entirely sure). Change-Id: I5913111060226b540dcf003257c99a08e84da0de
This commit is contained in:
parent
9d97d1cb68
commit
6646b80396
8 changed files with 12 additions and 0 deletions
|
@ -214,6 +214,9 @@ deps += gtest
|
||||||
toml11 = dependency('toml11', version : '>=3.7.0', required : true)
|
toml11 = dependency('toml11', version : '>=3.7.0', required : true)
|
||||||
deps += toml11
|
deps += toml11
|
||||||
|
|
||||||
|
nlohmann_json = dependency('nlohmann_json', required : true)
|
||||||
|
deps += nlohmann_json
|
||||||
|
|
||||||
#
|
#
|
||||||
# Build-time tools
|
# Build-time tools
|
||||||
#
|
#
|
||||||
|
|
|
@ -44,6 +44,7 @@ libcmd = library(
|
||||||
boehm,
|
boehm,
|
||||||
editline,
|
editline,
|
||||||
lowdown,
|
lowdown,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
install : true,
|
install : true,
|
||||||
# FIXME(Qyriad): is this right?
|
# FIXME(Qyriad): is this right?
|
||||||
|
|
|
@ -139,6 +139,7 @@ libexpr = library(
|
||||||
boehm,
|
boehm,
|
||||||
boost,
|
boost,
|
||||||
toml11,
|
toml11,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
# for shared.hh
|
# for shared.hh
|
||||||
include_directories : [
|
include_directories : [
|
||||||
|
|
|
@ -28,6 +28,7 @@ libfetchers = library(
|
||||||
dependencies : [
|
dependencies : [
|
||||||
liblixstore,
|
liblixstore,
|
||||||
liblixutil,
|
liblixutil,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
install : true,
|
install : true,
|
||||||
# FIXME(Qyriad): is this right?
|
# FIXME(Qyriad): is this right?
|
||||||
|
|
|
@ -180,6 +180,7 @@ libstore = library(
|
||||||
aws_sdk,
|
aws_sdk,
|
||||||
aws_s3,
|
aws_s3,
|
||||||
aws_sdk_transfer,
|
aws_sdk_transfer,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
cpp_args : cpp_args,
|
cpp_args : cpp_args,
|
||||||
install : true,
|
install : true,
|
||||||
|
|
|
@ -105,6 +105,7 @@ libutil = library(
|
||||||
libarchive,
|
libarchive,
|
||||||
brotli,
|
brotli,
|
||||||
openssl,
|
openssl,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
implicit_include_directories : true,
|
implicit_include_directories : true,
|
||||||
install : true,
|
install : true,
|
||||||
|
|
|
@ -87,6 +87,7 @@ nix = executable(
|
||||||
liblixfetchers,
|
liblixfetchers,
|
||||||
liblixmain,
|
liblixmain,
|
||||||
boehm,
|
boehm,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
install : true,
|
install : true,
|
||||||
# FIXME(Qyriad): is this right?
|
# FIXME(Qyriad): is this right?
|
||||||
|
|
|
@ -63,6 +63,7 @@ libutil_tester = executable(
|
||||||
liblixutil,
|
liblixutil,
|
||||||
liblixexpr,
|
liblixexpr,
|
||||||
liblixutil_test_support,
|
liblixutil_test_support,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -127,6 +128,7 @@ libstore_tester = executable(
|
||||||
liblixutil,
|
liblixutil,
|
||||||
rapidcheck,
|
rapidcheck,
|
||||||
gtest,
|
gtest,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -191,6 +193,7 @@ libexpr_tester = executable(
|
||||||
rapidcheck,
|
rapidcheck,
|
||||||
boehm,
|
boehm,
|
||||||
gtest,
|
gtest,
|
||||||
|
nlohmann_json,
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue