diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-01 15:19:08 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-03-04 09:24:37 +0000 |
| commit | bfca573f87568909d73badadcea686b26171cec1 (patch) | |
| tree | e13e27b19b2a7de206501922ae8c31e67e1eea05 /src/dbus | |
| parent | 9a7af3949a9839ff9047d7923f68e8d98d960b02 (diff) | |
CMake: Re-generate CMakeLists.txt file for dbus
Change-Id: I13ce987d4db99e160bf579ea3a785ac45cc1417b
Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
Diffstat (limited to 'src/dbus')
| -rw-r--r-- | src/dbus/CMakeLists.txt | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 4150c1274a..dd01256530 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -1,7 +1,7 @@ # Generated from dbus.pro. ##################################################################### -## QtDBus Module: +## DBus Module: ##################################################################### add_qt_module(DBus @@ -21,7 +21,7 @@ add_qt_module(DBus qdbusinterface.cpp qdbusinterface.h qdbusinterface_p.h qdbusinternalfilters.cpp qdbusintrospection.cpp qdbusintrospection_p.h -# FIXME: this file is included in qdbusargument.cpp: qdbusmarshaller.cpp + qdbusmarshaller.cpp qdbusmessage.cpp qdbusmessage.h qdbusmessage_p.h qdbusmetaobject.cpp qdbusmetatype.cpp qdbusmetatype.h @@ -42,17 +42,31 @@ add_qt_module(DBus DBUS_API_SUBJECT_TO_CHANGE QT_NO_FOREACH LIBRARIES - Qt::Core Qt::CorePrivate + # MODULE_CONFIG = "dbusadaptors" "dbusinterfaces" + # _LOADED = "qt_module" ) +set_source_files_properties(qdbusmarshaller.cpp + PROPERTIES HEADER_FILE_ONLY ON) # special case: This file is included by qdbusargument.cpp + + ## Scopes: ##################################################################### extend_target(DBus CONDITION QT_FEATURE_dbus_linked - DEFINES QT_LINKED_LIBDBUS LIBRARIES dbus + DEFINES + QT_LINKED_LIBDBUS + LIBRARIES + dbus ) -extend_target(DBus CONDITION WIN32 LIBRARIES ws2_32 advapi32 netapi32 user32) +extend_target(DBus CONDITION WIN32 + LIBRARIES + ws2_32 + advapi32 + netapi32 + user32 +) add_qt_docs(./doc/qtdbus.qdocconf) |