build: simplify nlohmann-json subproject and update
The bitbake package for nlohmann-json installs a nlohmann_json.pc
file and the subproject has a meson variable. We can simplify the
dependency in the meson file significantly by using the correct
dependency name and adding a minor tweak to the wrapfile.
Also update the revision to HEAD rather than pinning.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Iddbbf8117d7d8e7a0cc6a4f9ad5c6e9bff984834
diff --git a/meson.build b/meson.build
index 0148a0c..cfaf101 100644
--- a/meson.build
+++ b/meson.build
@@ -22,17 +22,7 @@
sdbusplus = dependency('sdbusplus')
systemd = dependency('systemd')
-if cxx.has_header('nlohmann/json.hpp')
- nlohmann_json_dep = declare_dependency()
-else
- subproject('nlohmann', required: false)
- nlohmann_json_dep = declare_dependency(
- include_directories: [
- 'subprojects/nlohmann-json/single_include',
- 'subprojects/nlohmann-json/single_include/nlohmann',
- ]
- )
-endif
+nlohmann_json_dep = dependency('nlohmann_json')
if cxx.has_header('CLI/CLI.hpp')
cli11_dep = declare_dependency()