build: Update sdbusplus-gen-meson
Change-Id: Idb647ddb3b0453d05cf3a55e883e0f4b26227b81
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/gen/meson.build b/gen/meson.build
index 56193c7..2756633 100644
--- a/gen/meson.build
+++ b/gen/meson.build
@@ -4,10 +4,10 @@
'--version',
).stdout().strip().split('\n')[0]
-if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 3'
+if sdbuspp_gen_meson_ver != 'sdbus++-gen-meson version 4'
warning('Generated meson files from wrong version of sdbus++-gen-meson.')
warning(
- 'Expected "sdbus++-gen-meson version 3", got:',
+ 'Expected "sdbus++-gen-meson version 4", got:',
sdbuspp_gen_meson_ver
)
endif
diff --git a/gen/xyz/openbmc_project/Network/IP/Create/meson.build b/gen/xyz/openbmc_project/Network/IP/Create/meson.build
index 16dc0a1..647c812 100644
--- a/gen/xyz/openbmc_project/Network/IP/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/Create/meson.build
@@ -3,6 +3,7 @@
'xyz/openbmc_project/Network/IP/Create__cpp'.underscorify(),
input: [ '../../../../../../yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
output: [ 'server.cpp', 'server.hpp', 'client.hpp', ],
+ depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
diff --git a/gen/xyz/openbmc_project/Network/IP/meson.build b/gen/xyz/openbmc_project/Network/IP/meson.build
index 8f0184b..936df4b 100644
--- a/gen/xyz/openbmc_project/Network/IP/meson.build
+++ b/gen/xyz/openbmc_project/Network/IP/meson.build
@@ -4,6 +4,7 @@
'xyz/openbmc_project/Network/IP/Create__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Network/IP/Create.interface.yaml', ],
output: [ 'Create.md' ],
+ depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
index 7bc95ee..25ebae8 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/CreateStatic/meson.build
@@ -3,6 +3,7 @@
'xyz/openbmc_project/Network/Neighbor/CreateStatic__cpp'.underscorify(),
input: [ '../../../../../../yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
output: [ 'server.cpp', 'server.hpp', 'client.hpp', ],
+ depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
diff --git a/gen/xyz/openbmc_project/Network/Neighbor/meson.build b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
index 4cc58c6..7e45de5 100644
--- a/gen/xyz/openbmc_project/Network/Neighbor/meson.build
+++ b/gen/xyz/openbmc_project/Network/Neighbor/meson.build
@@ -4,6 +4,7 @@
'xyz/openbmc_project/Network/Neighbor/CreateStatic__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Network/Neighbor/CreateStatic.interface.yaml', ],
output: [ 'CreateStatic.md' ],
+ depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
diff --git a/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build b/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
index 2ba7646..3fd78f5 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/Create/meson.build
@@ -3,6 +3,7 @@
'xyz/openbmc_project/Network/VLAN/Create__cpp'.underscorify(),
input: [ '../../../../../../yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
output: [ 'server.cpp', 'server.hpp', 'client.hpp', ],
+ depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'cpp',
'--output', meson.current_build_dir(),
diff --git a/gen/xyz/openbmc_project/Network/VLAN/meson.build b/gen/xyz/openbmc_project/Network/VLAN/meson.build
index b17337d..c067c35 100644
--- a/gen/xyz/openbmc_project/Network/VLAN/meson.build
+++ b/gen/xyz/openbmc_project/Network/VLAN/meson.build
@@ -4,6 +4,7 @@
'xyz/openbmc_project/Network/VLAN/Create__markdown'.underscorify(),
input: [ '../../../../../yaml/xyz/openbmc_project/Network/VLAN/Create.interface.yaml', ],
output: [ 'Create.md' ],
+ depend_files: sdbusplusplus_depfiles,
command: [
sdbuspp_gen_meson_prog, '--command', 'markdown',
'--output', meson.current_build_dir(),
diff --git a/meson.build b/meson.build
index f227b1a..36b00f6 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,10 @@
sdbusplus_dep = dependency('sdbusplus')
sdbusplusplus_prog = find_program('sdbus++', native: true)
sdbuspp_gen_meson_prog = find_program('sdbus++-gen-meson', native: true)
+sdbusplusplus_depfiles = files()
+if sdbusplus_dep.type_name() == 'internal'
+ sdbusplusplus_depfiles = subproject('sdbusplus').get_variable('sdbusplusplus_depfiles')
+endif
generated_sources = []
generated_others = []