commit 60b5bd2fd8e42bd52929a4a7ea7b44ac2cfe46f8
author Andrew Jeffery <andrew@aj.id.au> Tue Jun 15 10:41:28 2021 +0930
committer Santosh Puranik <santosh.puranik@in.ibm.com> Mon Aug 16 10:28:50 2021 +0000
tree a6486c108ec686ca68b8765eaa57890a739762b1
parent 8cc5b15ca630e3f2daf6a6ef5c8b19dd1b6349e2

meson: Add OpenBMC-specific subprojects

phosphor-dbus-interfaces and phosphor-logging depend on the build tools
provided by sdbusplus, so add appropriate configuration to ensure these
are picked up in the dependent subproject builds.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: I3b866a928043ab245a195f4403be68aa19601550

meson.build

diff --git a/meson.build b/meson.build
index c2f2806..ede4138 100644
--- a/meson.build
+++ b/meson.build
@@ -15,9 +15,15 @@
 
 add_global_arguments('-Wno-psabi', language : ['c', 'cpp'])
 
-sdbusplus = dependency('sdbusplus')
-phosphor_logging = dependency('phosphor-logging')
-phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces')
+phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces',
+    default_options: [ 'data_com_ibm=true', 'data_org_open_power=true' ],
+    fallback: ['phosphor-dbus-interfaces', 'phosphor_dbus_interfaces_dep'])
+
+phosphor_logging = dependency('phosphor-logging',
+    default_options: [ 'openpower-pel-extension=enabled' ],
+    fallback: ['phosphor-logging', 'phosphor_logging_dep'])
+
+sdbusplus = dependency('sdbusplus', fallback: [ 'sdbusplus', 'sdbusplus_dep' ])
 
 compiler = meson.get_compiler('cpp')
 python = find_program('python3', required:true)

subprojects/phosphor-dbus-interfaces.wrap

diff --git a/subprojects/phosphor-dbus-interfaces.wrap b/subprojects/phosphor-dbus-interfaces.wrap
new file mode 100644
index 0000000..935a8b2
--- /dev/null
+++ b/subprojects/phosphor-dbus-interfaces.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-dbus-interfaces.git
+revision = HEAD

subprojects/phosphor-logging.wrap

diff --git a/subprojects/phosphor-logging.wrap b/subprojects/phosphor-logging.wrap
new file mode 100644
index 0000000..a039fcf
--- /dev/null
+++ b/subprojects/phosphor-logging.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-logging.git
+revision = HEAD

subprojects/sdbusplus.wrap

diff --git a/subprojects/sdbusplus.wrap b/subprojects/sdbusplus.wrap
new file mode 100644
index 0000000..d470130
--- /dev/null
+++ b/subprojects/sdbusplus.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/sdbusplus.git
+revision = HEAD