commit 920566bf8c2b7140e22944a833d7109a911d2199
author Patrick Williams <patrick@stwcx.xyz> Fri Dec 08 06:39:32 2023 -0600
committer SunnySrivastava <sunnsr25@in.ibm.com> Thu Jan 04 06:00:33 2024 +0000
tree c958eb67580c031e9088d2a7c8272a3f144ed341
parent 468e8c5b1e3d500357c82f7af55fe0de12edfff0

meson: adjust nlohmann-json dependency

Simplify nlohmann-json dependency logic and align wrap file name with
other repositories.

Change-Id: Ie8a3590a474c0138932230fc9e9f11e457cbabea
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>

meson.build

diff --git a/meson.build b/meson.build
index 059f043..72e810b 100644
--- a/meson.build
+++ b/meson.build
@@ -50,6 +50,8 @@
     endif
 endif
 
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
+
 phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces',
     default_options: [ 'data_com_ibm=true', 'data_org_open_power=true' ],
     fallback: ['phosphor-dbus-interfaces', 'phosphor_dbus_interfaces_dep'])
@@ -81,12 +83,6 @@
     CLI11_dep = dependency('CLI11')
 endif
 
-if compiler.has_header('nlohmann/json.hpp')
-    nlohmann_json_dep = declare_dependency()
-else
-    nlohmann_json_dep = dependency('nlohmann-json')
-endif
-
 if not build_tests.disabled()
     subdir('test')
 endif

subprojects/nlohmann-json.wrap

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

subprojects/nlohmann_json.wrap

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