commit 90b400938fbed35040d9adf17c2af897b1046e12
author Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 11:50:22 2022 -0500
committer Patrick Williams <patrick@stwcx.xyz> Mon Mar 21 11:50:24 2022 -0500
tree a6931badb5169a8f94b6c83d74c16b2c02b7f482
parent 6f80f80e02f220d3d13a0a6271fa1afd54dc706d

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

subprojects/CLI11.wrap

diff --git a/subprojects/CLI11.wrap b/subprojects/CLI11.wrap
new file mode 100644
index 0000000..2e5a95b
--- /dev/null
+++ b/subprojects/CLI11.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+url = https://github.com/CLIUtils/CLI11.git
+revision = HEAD
+
+[provide]
+CLI11 = CLI11_dep

subprojects/cli11.wrap

diff --git a/subprojects/cli11.wrap b/subprojects/cli11.wrap
deleted file mode 100644
index 407409c..0000000
--- a/subprojects/cli11.wrap
+++ /dev/null
@@ -1,3 +0,0 @@
-[wrap-git]
-url = https://github.com/CLIUtils/CLI11
-revision = HEAD

subprojects/phosphor-dbus-interfaces.wrap

diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap
index 0be70dd..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
+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 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

subprojects/sdbusplus.wrap

diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
index 7f736e7..7b076d0 100644
--- a/subprojects/sdbusplus.wrap
+++ b/subprojects/sdbusplus.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
-url = https://github.com/openbmc/sdbusplus
+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 7503664..f871ac0 100644
--- a/subprojects/sdeventplus.wrap
+++ b/subprojects/sdeventplus.wrap
@@ -1,3 +1,6 @@
 [wrap-git]
-url = https://github.com/openbmc/sdeventplus
+url = https://github.com/openbmc/sdeventplus.git
 revision = HEAD
+
+[provide]
+sdeventplus = sdeventplus_dep