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')