meson: simplify dependencies
Leverage wrapfile `[provide]` directives to simplify the dependency
searching in the meson.build.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I5bbde5732df9604b6ea45eaae519bdf64c27ee3c
diff --git a/meson.build b/meson.build
index a108757..63e9f04 100644
--- a/meson.build
+++ b/meson.build
@@ -44,19 +44,14 @@
'environemt to point at boost build. To build a boost you can use ' +
'script ./scripts/boost_build_1.74.0.sh')
-phosphor_logging = dependency(
- 'phosphor-logging',
- fallback: ['phosphor-logging', 'phosphor_logging_dep'],
-)
-
-sdbusplus = dependency('sdbusplus', fallback: ['sdbusplus', 'sdbusplus_dep'])
+phosphor_logging = dependency('phosphor-logging')
+sdbusplus = dependency('sdbusplus')
systemd = dependency('systemd')
if cpp.has_header('nlohmann/json.hpp')
nlohmann_json = declare_dependency()
else
- nlohmann_json = dependency('nlohmann_json',
- fallback: ['nlohmann', 'nlohmann_json_dep'])
+ nlohmann_json = dependency('nlohmann_json')
endif
add_project_arguments(
diff --git a/subprojects/nlohmann.wrap b/subprojects/nlohmann.wrap
index f1c5df4..477e844 100644
--- a/subprojects/nlohmann.wrap
+++ b/subprojects/nlohmann.wrap
@@ -1,5 +1,6 @@
-[wrap-file]
-source_url = https://github.com/nlohmann/json/releases/download/v3.9.1/include.zip
-source_filename = nlohmann-json-v3.9.1-include.zip
-source_hash = 6bea5877b1541d353bd77bdfbdb2696333ae5ed8f9e8cc22df657192218cad91
-lead_directory_missing = nlohmann-json-v3.9.1
+[wrap-git]
+url = https://github.com/nlohmann/json
+revision = HEAD
+
+[provide]
+nlohmann_json = nlohmann_json_dep
diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
index c15c63d..71eee8b 100644
--- a/subprojects/phosphor-logging.wrap
+++ b/subprojects/phosphor-logging.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/phosphor-logging.git
-revision = dd4bd482f1009576a7a074cc63c6a9ce6698876d
+revision = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep
diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
index f8da7b3..7b076d0 100644
--- a/subprojects/sdbusplus.wrap
+++ b/subprojects/sdbusplus.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/sdbusplus.git
-revision = ce62764d6c0a72ec88eb433e1afd05b751225971
+revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep