Change nlohmann to nlohmann_json
c9374ff613b6836010877f8083e75657abc78343
Was recently checked in that adds subproject files for nlohmann. It
opted for the name "nlohmann" when the upstream project installs itself
as "nlohmann_json". This mismatch causes a yocto build failure.
Fix it.
Tested: Code compiles
Change-Id: I2df5f473a61172593e9a1045fc5a229e06e3afc2
Signed-off-by: Ed Tanous <edtanous@google.com>
diff --git a/meson.build b/meson.build
index cdfc3dd..e59eee9 100644
--- a/meson.build
+++ b/meson.build
@@ -282,9 +282,9 @@
zlib = dependency('zlib')
bmcweb_dependencies += [systemd, zlib]
-nlohmann_json = dependency('nlohmann', version: '>=3.9.2', required: false, include_type: 'system')
+nlohmann_json = dependency('nlohmann_json', version: '>=3.9.2', required: false, include_type: 'system')
if not nlohmann_json.found()
- nlohmann_json_proj = subproject('nlohmann', required: true)
+ 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
diff --git a/subprojects/nlohmann.wrap b/subprojects/nlohmann.wrap
deleted file mode 100644
index b6e9fd5..0000000
--- a/subprojects/nlohmann.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-revision = 8fcdbf2e771f481d988cb36847d6af6b17e30a99
-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..d2201c4
--- /dev/null
+++ b/subprojects/nlohmann_json.wrap
@@ -0,0 +1,11 @@
+[wrap-file]
+directory = nlohmann_json-3.11.2
+lead_directory_missing = true
+source_url = https://github.com/nlohmann/json/releases/download/v3.11.2/include.zip
+source_filename = nlohmann_json-3.11.2.zip
+source_hash = e5c7a9f49a16814be27e4ed0ee900ecd0092bfb7dbfca65b5a421b774dccaaed
+wrapdb_version = 3.11.2-1
+
+[provide]
+nlohmann_json = nlohmann_json_dep
+