meson: adjust nlohmann-json dependency
Simplify the nlohmann-json dependency and align the wrap file with other
repositories.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ic41132c20f48da7591ff380b3448ab73fa78052b
diff --git a/meson.build b/meson.build
index 6593b3d..741347b 100644
--- a/meson.build
+++ b/meson.build
@@ -23,17 +23,6 @@
language: 'cpp',
)
-if cpp.has_header('nlohmann/json.hpp')
- nlohmann_json_dep = declare_dependency()
-else
- subproject('nlohmann-json')
- nlohmann_json_dep = declare_dependency(
- include_directories: include_directories(
- 'subprojects/nlohmann-json/single_include',
- 'subprojects/nlohmann-json/single_include/nlohmann',
- )
- )
-endif
boost_dep = dependency(
'boost',
@@ -41,6 +30,7 @@
include_type: 'system',
)
i2c_dep = cpp.find_library('i2c')
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
phosphor_logging_dep = dependency('phosphor-logging')
sdbusplus_dep = dependency('sdbusplus')
systemd_dep = dependency('systemd')
diff --git a/subprojects/nlohmann-json.wrap b/subprojects/nlohmann-json.wrap
deleted file mode 100644
index a77b7c9..0000000
--- a/subprojects/nlohmann-json.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-revision = b3e5cb7f20dcc5c806e418df34324eca60d17d4e
-url = https://github.com/nlohmann/json.git
diff --git a/subprojects/nlohmann_json.wrap b/subprojects/nlohmann_json.wrap
new file mode 100644
index 0000000..3745380
--- /dev/null
+++ b/subprojects/nlohmann_json.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+revision = HEAD
+url = https://github.com/nlohmann/json.git
+
+[provide]
+nlohmann_json = nlohmann_json_dep