meson: adjust nlohmann-json dependency
* Simplify the meson.build boiler-plate for meson.
* Rename the wrap file for consistency with other repositories.
* Adjust the meson required version to match the wrap file.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I2da418c10fbe0450944567d276b17f3196da0b55
diff --git a/meson.build b/meson.build
index 541fa5e..f3e0ed3 100644
--- a/meson.build
+++ b/meson.build
@@ -300,13 +300,8 @@
zlib = dependency('zlib')
bmcweb_dependencies += [systemd, zlib]
-nlohmann_json = dependency('nlohmann_json', version: '>=3.9.2', required: false, include_type: 'system')
-if not nlohmann_json.found()
- nlohmann_json_proj = subproject('nlohmann_json', required: true)
- nlohmann_json = nlohmann_json_proj.get_variable('nlohmann_json_dep')
- nlohmann_json = nlohmann_json.as_system('system')
-endif
-bmcweb_dependencies += nlohmann_json
+nlohmann_json_dep = dependency('nlohmann_json', version: '>=3.11.2', include_type: 'system')
+bmcweb_dependencies += nlohmann_json_dep
boost = dependency(
'boost',