meson: adjust nlohmann-json dependency
Simplify meson dependency logic and align the wrap file name with that
used in other repositories.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ib73cf0b7d43ff62afaaa6a4e7161ba0bbd2569c4
diff --git a/meson.build b/meson.build
index f06e021..a771f06 100644
--- a/meson.build
+++ b/meson.build
@@ -58,14 +58,7 @@
channellayer_dep = dependency('libchannellayer')
userlayer_dep = dependency('libuserlayer')
-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
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
zfboemcmds_pre = declare_dependency(
include_directories: root_inc,
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