diff options
| -rw-r--r-- | src/dbus/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbustype/CMakeLists.txt | 24 |
3 files changed, 33 insertions, 18 deletions
diff --git a/src/dbus/CMakeLists.txt b/src/dbus/CMakeLists.txt index 09fcdfd255..4768460e05 100644 --- a/src/dbus/CMakeLists.txt +++ b/src/dbus/CMakeLists.txt @@ -60,18 +60,10 @@ set_source_files_properties(qdbusmarshaller.cpp extend_target(DBus CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS - PUBLIC_LIBRARIES # special case + LIBRARIES dbus-1 ) -# begin special case: -extend_target(DBus CONDITION NOT QT_FEATURE_dbus_linked - PUBLIC_LIBRARIES - dbus-1_nolink -) -# end special case: - - extend_target(DBus CONDITION WIN32 LIBRARIES advapi32 diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt index bb1debd590..c96944cd56 100644 --- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt @@ -1,26 +1,41 @@ # Generated from qdbusinterface.pro. +# special case begin add_subdirectory(qmyserver) +##################################################################### +## ../tst_qdbusinterface Test: +##################################################################### + add_qt_test(tst_qdbusinterface SOURCES myobject.h tst_qdbusinterface.cpp LIBRARIES Qt::CorePrivate - Qt::DBus Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus ) +#### Keys ignored in scope 1:.:.:qdbusinterface.pro:<TRUE>: +# CONFIG = "testcase" +# DESTDIR = "./" + ## Scopes: ##################################################################### extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES + dbus-1 ) extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../src/dbus/qdbus_symbols.cpp ) + +# special case end diff --git a/tests/auto/dbus/qdbustype/CMakeLists.txt b/tests/auto/dbus/qdbustype/CMakeLists.txt index c76f44ba02..fc0c014a07 100644 --- a/tests/auto/dbus/qdbustype/CMakeLists.txt +++ b/tests/auto/dbus/qdbustype/CMakeLists.txt @@ -10,17 +10,25 @@ add_qt_test(tst_qdbustype LIBRARIES Qt::CorePrivate Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus ) +#### Keys ignored in scope 1:.:.:qdbustype.pro:<TRUE>: +# CONFIG = "testcase" "parallel_test" + ## Scopes: ##################################################################### -extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked - DEFINES - QT_LINKED_LIBDBUS -) + extend_target(tst_qdbustype CONDITION QT_FEATURE_dbus_linked + DEFINES + QT_LINKED_LIBDBUS + LIBRARIES + dbus-1 + ) -extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked - SOURCES - ../../../../src/dbus/qdbus_symbols.cpp -) + extend_target(tst_qdbustype CONDITION NOT QT_FEATURE_dbus_linked + SOURCES + ../../../../src/dbus/qdbus_symbols.cpp + ) |