summaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorEd Tanous <edtanous@google.com>2023-06-06 18:26:29 +0300
committerEd Tanous <ed@tanous.net>2023-06-06 19:08:02 +0300
commit982dd79d371c48f48ea1e3462545ac4e2a8b4f93 (patch)
treeb5c8a5322a1469e4c5e3ec22b52dbd924dba912c /subprojects
parent21b4aba40554549204a02d71a998379dc2ea44f4 (diff)
downloadbmcweb-982dd79d371c48f48ea1e3462545ac4e2a8b4f93.tar.xz
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>
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/nlohmann.wrap3
-rw-r--r--subprojects/nlohmann_json.wrap11
2 files changed, 11 insertions, 3 deletions
diff --git a/subprojects/nlohmann.wrap b/subprojects/nlohmann.wrap
deleted file mode 100644
index b6e9fd5f48..0000000000
--- 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 0000000000..d2201c4701
--- /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
+