summaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@qt.io>2019-03-28 15:31:07 +0100
committerTobias Hunger <tobias.hunger@qt.io>2019-03-29 14:29:47 +0000
commit03a64ab80dd31b0c0963801a3bf929093ddb8c05 (patch)
tree773c0e22295f80f9153f2e7c7d8ebaa52433d38c /util
parent75658794e4a016090abd664b36acb5e4fdbbc802 (diff)
CMake: pro2cmake.py: Handle QDBUSXML2CPP_*_HEADER_FLAGS
Change-Id: Ib5d34a6bf550a11154109064e4e718d0c79c722b Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'util')
-rwxr-xr-xutil/cmake/pro2cmake.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py
index 043b9568e8..7a6e6abbae 100755
--- a/util/cmake/pro2cmake.py
+++ b/util/cmake/pro2cmake.py
@@ -885,6 +885,10 @@ def write_sources_section(cm_fh: typing.IO[str], scope: Scope, *,
cm_fh.write('{} DBUS_ADAPTOR_SOURCES\n'.format(ind))
for d in sort_sources(dbus_adaptors):
cm_fh.write('{} {}\n'.format(ind, d))
+ dbus_adaptor_flags = scope.expand('QDBUSXML2CPP_ADAPTOR_HEADER_FLAGS')
+ if dbus_adaptor_flags:
+ cm_fh.write('{} DBUS_ADAPTOR_FLAGS\n'.format(ind))
+ cm_fh.write('{} "{}"\n'.format(ind, '" "'.join(dbus_adaptor_flags)))
dbus_interfaces = scope.expand('DBUS_INTERFACES')
if dbus_interfaces:
@@ -892,6 +896,10 @@ def write_sources_section(cm_fh: typing.IO[str], scope: Scope, *,
cm_fh.write('{} DBUS_INTERFACE_SOURCES\n'.format(ind))
for d in sort_sources(dbus_interfaces):
cm_fh.write('{} {}\n'.format(ind, d))
+ dbus_interface_flags = scope.expand('QDBUSXML2CPP_INTERFACE_HEADER_FLAGS')
+ if dbus_interface_flags:
+ cm_fh.write('{} DBUS_INTERFACE_FLAGS\n'.format(ind))
+ cm_fh.write('{} "{}"\n'.format(ind, '" "'.join(dbus_interface_flags)))
defines = scope.expand('DEFINES')
if defines: