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: I5a946b39aac7fc99b009c0a4abda681e8dd7fcca
diff --git a/meson.build b/meson.build
index dc663d2..0c7f34c 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@
cpp_args = []
deps = [
- dependency('sdbusplus', fallback: ['sdbusplus', 'sdbusplus_dep']),
+ dependency('sdbusplus'),
dependency('systemd'),
]
@@ -31,9 +31,7 @@
if get_option('send-to-logger')
cpp_args += '-DSEL_LOGGER_SEND_TO_LOGGING_SERVICE'
- deps += dependency(
- 'phosphor-logging',
- fallback: ['phosphor-logging', 'phosphor_logging_dep'])
+ deps += dependency('phosphor-logging')
endif
if get_option('clears-sel')
cpp_args += '-DSEL_LOGGER_CLEARS_SEL'
diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
index 8db07b6..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
+url = https://github.com/openbmc/phosphor-logging.git
revision = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep
diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
index d470130..7b076d0 100644
--- a/subprojects/sdbusplus.wrap
+++ b/subprojects/sdbusplus.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/sdbusplus.git
revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep