commit f814e5b3172414393d666a8d176fe55b0d305389
author Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 11:14:17 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 11:14:19 2022 -0500
tree a875913f5f665de36c1a439815d32cd4f3b1ccb9
parent b15df6b28b97a0887e52d5f5e5899b10475943e1

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: I39d423dad8a08949317c991b845aaa5fc23969a4

meson.build

diff --git a/meson.build b/meson.build
index abad426..fe6e095 100644
--- a/meson.build
+++ b/meson.build
@@ -11,14 +11,8 @@
     version: '1.0',
 )
 
-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')
 
 if get_option('tests').enabled()
     gtest = dependency('gtest', main: true, disabler: true, required: false)

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