meson: adjust nlohmann-json dependency
Simplify dependency detection logic and align wrap file name with other
repositories.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iab3ae4b39677f40e88801865b6c3ddfe77d43d40
diff --git a/meson.build b/meson.build
index c8f0c31..552634e 100644
--- a/meson.build
+++ b/meson.build
@@ -46,17 +46,13 @@
install: true,
install_dir: systemd_system_unit_dir)
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
phosphor_logging_dep = dependency('phosphor-logging')
sdbusplus_dep = dependency('sdbusplus')
libsystemd_dep = dependency('libsystemd')
ipmid_dep = dependency('libipmid')
-if cxx.has_header('nlohmann/json.hpp')
- nlohmann_json_dep = declare_dependency()
-else
- nlohmann_json_dep = dependency('nlohmann-json')
-endif
if cxx.has_header('CLI/CLI.hpp')
CLI11_dep = declare_dependency()
diff --git a/subprojects/nlohmann-json.wrap b/subprojects/nlohmann-json.wrap
deleted file mode 100644
index a2884b1..0000000
--- a/subprojects/nlohmann-json.wrap
+++ /dev/null
@@ -1,6 +0,0 @@
-[wrap-git]
-url = https://github.com/nlohmann/json
-revision = HEAD
-
-[provide]
-nlohmann-json = nlohmann_json_dep
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