From 03a64ab80dd31b0c0963801a3bf929093ddb8c05 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Thu, 28 Mar 2019 15:31:07 +0100 Subject: [PATCH] CMake: pro2cmake.py: Handle QDBUSXML2CPP_*_HEADER_FLAGS Change-Id: Ib5d34a6bf550a11154109064e4e718d0c79c722b Reviewed-by: Albert Astals Cid --- util/cmake/pro2cmake.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 043b9568e8a..7a6e6abbae4 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: