diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-28 15:24:05 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-29 14:29:29 +0000 |
| commit | 75658794e4a016090abd664b36acb5e4fdbbc802 (patch) | |
| tree | 31bf2f90749e46eba8d27cd9995d50fef2a717c8 /util | |
| parent | b9a3217c41560ee4a296797a394620761ca3a471 (diff) | |
CMake: pro2cmake.py: Improve handling of dbus interfaces/adaptor sources
Change-Id: I3b642e1ae31996a81618e312183f4cc168bbbe1b
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/cmake/pro2cmake.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/util/cmake/pro2cmake.py b/util/cmake/pro2cmake.py index 900914eab3..043b9568e8 100755 --- a/util/cmake/pro2cmake.py +++ b/util/cmake/pro2cmake.py @@ -881,12 +881,14 @@ def write_sources_section(cm_fh: typing.IO[str], scope: Scope, *, dbus_adaptors = scope.expand('DBUS_ADAPTORS') if dbus_adaptors: + dbus_adaptors = [map_source_to_cmake(s, scope.basedir, vpath) for s in dbus_adaptors] cm_fh.write('{} DBUS_ADAPTOR_SOURCES\n'.format(ind)) for d in sort_sources(dbus_adaptors): cm_fh.write('{} {}\n'.format(ind, d)) dbus_interfaces = scope.expand('DBUS_INTERFACES') if dbus_interfaces: + dbus_interfaces = [map_source_to_cmake(s, scope.basedir, vpath) for s in dbus_interfaces] cm_fh.write('{} DBUS_INTERFACE_SOURCES\n'.format(ind)) for d in sort_sources(dbus_interfaces): cm_fh.write('{} {}\n'.format(ind, d)) |