meson: simplify dependencies
Leverage wrapfile `[provide]` directives to simplify the dependency
searching in the meson.build.
Change-Id: Ibbf0b490ba9ea5dc8e171b1e6212d2d2d71b5550
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 63f4120..8bba339 100644
--- a/meson.build
+++ b/meson.build
@@ -10,19 +10,9 @@
version: '1.0.0',
)
-# Get sdbusplus dependency.
-sdbusplus_dep = dependency('sdbusplus', required: false)
-if sdbusplus_dep.found() and sdbusplus_dep.type_name() != 'internal'
- sdbusplusplus_prog = find_program('sdbus++', native: true)
- sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson', native: true)
-else
- sdbusplus_proj = subproject('sdbusplus', required: true)
- sdbusplus_dep = sdbusplus_proj.get_variable('sdbusplus_dep')
- sdbusplusplus_prog = sdbusplus_proj.get_variable('sdbusplusplus_prog')
- sdbuspp_gen_meson_prog = sdbusplus_proj.get_variable(
- 'sdbuspp_gen_meson_prog'
- )
-endif
+sdbusplus_dep = dependency('sdbusplus')
+sdbusplusplus_prog = find_program('sdbus++', native: true)
+sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson', native: true)
# Parse options to determine appropriate subdirectories to support.
selected_subdirs = []
diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
index d470130..edd9a31 100644
--- a/subprojects/sdbusplus.wrap
+++ b/subprojects/sdbusplus.wrap
@@ -1,3 +1,7 @@
[wrap-git]
url = https://github.com/openbmc/sdbusplus.git
revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep
+program_names = sdbus++, sdbus++-gen-meson