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: Id8a0909445b38271c0cdea79bad0ca9198cf7f0a
diff --git a/meson.build b/meson.build
index 0962ee5..f227b1a 100644
--- a/meson.build
+++ b/meson.build
@@ -23,16 +23,9 @@
conf_data.set('SYNC_MAC_FROM_INVENTORY', get_option('sync-mac'))
conf_data.set('PERSIST_MAC', get_option('persist-mac'))
-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)
generated_sources = []
generated_others = []
@@ -41,9 +34,7 @@
subdir('gen/xyz')
networkd_dbus_includes = include_directories('gen')
-phosphor_dbus_interfaces_dep = dependency(
- 'phosphor-dbus-interfaces',
- fallback: ['phosphor-dbus-interfaces', 'phosphor_dbus_interfaces_dep'])
+phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
networkd_dbus_deps = [
phosphor_dbus_interfaces_dep,