meson: simplify dependencies
The preferred way for identifying dependency fallback variables is
for the subproject wrap files to express them. Move from the
meson.build to the corresponding wrap files.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I83284ee1c6892503ff436c8280c1c5aeaf4149c0
diff --git a/meson.build b/meson.build
index 7dc0752..a1f25d8 100644
--- a/meson.build
+++ b/meson.build
@@ -81,27 +81,9 @@
endif
nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
-sdeventplus_dep = dependency(
- 'sdeventplus',
- fallback: [
- 'sdeventplus',
- 'sdeventplus_dep'
- ],
-)
-phosphor_dbus_interfaces_dep = dependency(
- 'phosphor-dbus-interfaces',
- fallback: [
- 'phosphor-dbus-interfaces',
- 'phosphor_dbus_interfaces_dep'
- ],
-)
-phosphor_logging_dep = dependency(
- 'phosphor-logging',
- fallback: [
- 'phosphor-logging',
- 'phosphor_logging_dep'
- ],
-)
+phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
+phosphor_logging_dep = dependency('phosphor-logging')
+sdeventplus_dep = dependency('sdeventplus')
deps += [
cereal_dep,
diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap
index 935a8b2..346aa0c 100644
--- a/subprojects/phosphor-dbus-interfaces.wrap
+++ b/subprojects/phosphor-dbus-interfaces.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/phosphor-dbus-interfaces.git
revision = HEAD
+
+[provide]
+phosphor-dbus-interfaces = phosphor_dbus_interfaces_dep
diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
index a039fcf..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 = HEAD
+
+[provide]
+phosphor-logging = phosphor_logging_dep
diff --git a/subprojects/sdeventplus.wrap b/subprojects/sdeventplus.wrap
index 085bb5e..f871ac0 100644
--- a/subprojects/sdeventplus.wrap
+++ b/subprojects/sdeventplus.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/sdeventplus.git
revision = HEAD
+
+[provide]
+sdeventplus = sdeventplus_dep