meson: adjust nlohmann-json dependency
Simplify nlohmann-json dependency logic and align wrap file name with
other repositories.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I70f42525bb61e7b353288e826cc7e89e1b03002f
diff --git a/meson.build b/meson.build
index 4432dd8..317d99e 100644
--- a/meson.build
+++ b/meson.build
@@ -41,21 +41,12 @@
configuration: conf_data
)
-sdbusplus_dep = dependency('sdbusplus')
-sdeventplus_dep = dependency('sdeventplus')
+gpioplus_dep = dependency('gpioplus')
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
phosphor_logging_dep = dependency('phosphor-logging')
-gpioplus_dep = dependency('gpioplus')
-
-cpp = meson.get_compiler('cpp')
-if cpp.has_header_symbol(
- 'nlohmann/json.hpp',
- 'nlohmann::json::string_t',
- required:false)
- nlohmann_json_dep = declare_dependency()
-else
- nlohmann_json_dep = dependency('nlohmann-json')
-endif
+sdbusplus_dep = dependency('sdbusplus')
+sdeventplus_dep = dependency('sdeventplus')
deps = [
sdbusplus_dep,
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