commit b729eac553278609494e30a37c63fec4ef62b7af
author Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 10:14:47 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 10:14:49 2022 -0500
tree b72532d4def9fca79892c92c68634fa4bdc6bc09
parent 1204b43374720e9b338ea0aa6be75d8d27e0477e

meson: simplify dependencies

Leverage wrapfile `[provide]` directives to simplify the dependency
searching in the meson.build.

Change-Id: I01c308089b1b6586f552a10cbcd0641faec4ae26

meson.build

diff --git a/meson.build b/meson.build
index 698aa7d..49ce8cb 100644
--- a/meson.build
+++ b/meson.build
@@ -39,25 +39,10 @@
         'virtualSensor.cpp',
     ],
     dependencies: [
-        dependency(
-            'phosphor-logging',
-            fallback: ['phosphor-logging', 'phosphor_logging_dep'],
-        ),
-        dependency(
-            'sdbusplus',
-            fallback: ['sdbusplus', 'sdbusplus_dep' ],
-        ),
-        dependency(
-            'phosphor-dbus-interfaces',
-            fallback: [
-                'phosphor-dbus-interfaces',
-                'phosphor_dbus_interfaces_dep'
-            ],
-        ),
-        dependency(
-            'sdeventplus',
-            fallback: ['sdeventplus', 'sdeventplus_dep'],
-        ),
+        dependency('phosphor-dbus-interfaces'),
+        dependency('phosphor-logging'),
+        dependency('sdbusplus'),
+        dependency('sdeventplus'),
         exprtk,
         nlohmann_json,
     ],

subprojects/phosphor-dbus-interfaces.wrap

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

subprojects/phosphor-logging.wrap

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

subprojects/sdbusplus.wrap

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

subprojects/sdeventplus.wrap

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