meson: simplify sdbusplus dependency
There is a lot of cruft in the sdbusplus dependency that is no longer
needed:
1. Use "dependency" with wrap file support rather than "subproject".
2. Remove "include_type: system" since this is part of sdbusplus
itself now.
3. Leverage wrap file "provides" directives for dependency variable
lookup.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I86945b57a146f5ac178f0982071cec9e69ee54dd
diff --git a/dbus_sensor_tester/meson.build b/dbus_sensor_tester/meson.build
index 2a17442..6cafb20 100644
--- a/dbus_sensor_tester/meson.build
+++ b/dbus_sensor_tester/meson.build
@@ -104,12 +104,7 @@
# automatically during the configure step
dependencies = []
-sdbusplus = dependency('sdbusplus', required: false, include_type: 'system')
-if not sdbusplus.found()
- sdbusplus_proj = subproject('sdbusplus', required: true)
- sdbusplus = sdbusplus_proj.get_variable('sdbusplus_dep')
- sdbusplus = sdbusplus.as_system('system')
-endif
+sdbusplus = dependency('sdbusplus')
dependencies += sdbusplus
cli11 = dependency('cli11', required: false, include_type: 'system')
diff --git a/dbus_sensor_tester/subprojects/sdbusplus.wrap b/dbus_sensor_tester/subprojects/sdbusplus.wrap
index d470130..7b076d0 100644
--- a/dbus_sensor_tester/subprojects/sdbusplus.wrap
+++ b/dbus_sensor_tester/subprojects/sdbusplus.wrap
@@ -1,3 +1,6 @@
[wrap-git]
url = https://github.com/openbmc/sdbusplus.git
revision = HEAD
+
+[provide]
+sdbusplus = sdbusplus_dep