Skip to content

Commit 11565fe

Browse files
meson: adjust nlohmann-json dependency
Simplify the meson directive for nlohmann-json dependency and rename the wrap file to align with other repositories. Signed-off-by: Patrick Williams <[email protected]> Change-Id: I6ad9d4fe3e8fa24673b736bab81e2fcabc51f1a0
1 parent 412f50e commit 11565fe

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

extensions/openpower-pels/meson.build

+1-5
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@ libpldm_dep = dependency(
33
default_options: ['oem-ibm=enabled'],
44
)
55

6-
if cpp.has_header('nlohmann/json.hpp')
7-
nlohmann_json_dep = declare_dependency()
8-
else
9-
nlohmann_json_dep = dependency('nlohmann-json')
10-
endif
6+
nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
117

128
python_inst = import('python').find_installation('python3')
139
python_ver = python_inst.language_version()

subprojects/nlohmann-json.wrap

-6
This file was deleted.

subprojects/nlohmann_json.wrap

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[wrap-git]
2+
revision = HEAD
3+
url = https://github.com/nlohmann/json.git
4+
5+
[provide]
6+
nlohmann_json = nlohmann_json_dep

0 commit comments

Comments
 (0)