meson: adjust nlohmann-json dependency
Simplify the nlohmann-json dependency in the meson.build and align
the wrap file name for consistency with the meson wrapdb.
Change-Id: I17dbb6eb1e26a8f9413a1d02c1233b88aa7d90bd
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index d2f59d8..cb32679 100644
--- a/meson.build
+++ b/meson.build
@@ -76,18 +76,7 @@
lrt = declare_dependency(link_args : '-lrt')
# JSON parser
-if cmplr.has_header('nlohmann/json.hpp')
- nlohmann_json_dep = declare_dependency()
-else
- subproject('nlohmann', required: false)
- nlohmann_json_dep = declare_dependency(
- include_directories: [
- 'subprojects/nlohmann/single_include',
- 'subprojects/nlohmann/single_include/nlohmann',
- ]
- )
- nlohmann_json_dep = nlohmann_json_dep.as_system('system')
-endif
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
# JSON validator
if cmplr.has_header('valijson/validator.hpp')
diff --git a/subprojects/nlohmann.wrap b/subprojects/nlohmann.wrap
deleted file mode 100644
index 3c028c3..0000000
--- a/subprojects/nlohmann.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-revision = e7b3b40b5a95bc74b9a7f662830a27c49ffc01b4
-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