diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-31 10:22:33 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-31 09:45:38 +0000 |
| commit | f80a37dcca2d2ef4d238e248e3fb267e679317fd (patch) | |
| tree | 9e9ed2e8a73cb996fab7b96979c7884046c752e2 /tests | |
| parent | 743b3d86734b314df9665a7e64adc387b4506594 (diff) | |
cmake: Enable qdbusinterface test
Change-Id: Ia25911216790abdf463306cdb2e9aecb7dcd276e
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/dbus/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt | 8 |
4 files changed, 31 insertions, 31 deletions
diff --git a/tests/auto/dbus/CMakeLists.txt b/tests/auto/dbus/CMakeLists.txt index 348c9c461c..ed61a5be9e 100644 --- a/tests/auto/dbus/CMakeLists.txt +++ b/tests/auto/dbus/CMakeLists.txt @@ -20,7 +20,7 @@ add_subdirectory(qdbusthreading) if(QT_FEATURE_process) add_subdirectory(qdbusabstractadaptor) add_subdirectory(qdbusabstractinterface) - # missing add_qt_binary: add_subdirectory("qdbusinterface") + add_subdirectory(qdbusinterface) if(QT_FEATURE_private_tests) add_subdirectory(qdbusmarshall) diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt index ae79490a83..bb1debd590 100644 --- a/tests/auto/dbus/qdbusinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt @@ -1,4 +1,26 @@ # Generated from qdbusinterface.pro. add_subdirectory(qmyserver) -add_subdirectory(qdbusinterface) + +add_qt_test(tst_qdbusinterface + SOURCES + myobject.h + tst_qdbusinterface.cpp + LIBRARIES + Qt::CorePrivate + Qt::DBus + Qt::DBusPrivate +) + +## Scopes: +##################################################################### + +extend_target(tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked + DEFINES + QT_LINKED_LIBDBUS +) + +extend_target(tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked + SOURCES + ../../../../src/dbus/qdbus_symbols.cpp +) diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt deleted file mode 100644 index 624ec00bd1..0000000000 --- a/tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt +++ /dev/null @@ -1,28 +0,0 @@ -# Generated from qdbusinterface.pro. - -##################################################################### -## ../tst_qdbusinterface Test: -##################################################################### - -add_qt_test(../tst_qdbusinterface - SOURCES - ../myobject.h - ../tst_qdbusinterface.cpp - LIBRARIES - Qt::CorePrivate - Qt::DBus - Qt::DBusPrivate -) - -## Scopes: -##################################################################### - -extend_target(../tst_qdbusinterface CONDITION QT_FEATURE_dbus_linked - DEFINES - QT_LINKED_LIBDBUS -) - -extend_target(../tst_qdbusinterface CONDITION NOT QT_FEATURE_dbus_linked - SOURCES - ../../../../../src/dbus/qdbus_symbols.cpp -) diff --git a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt index 627b29ff42..bbbe1e8633 100644 --- a/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -4,10 +4,16 @@ ## qmyserver Binary: ##################################################################### -add_qt_executable(qmyserver +# Can't be called qmyserver since the qdbusabstractadaptor test +# already has a executable target named like that, so use +# a different target name and then rename the binary +add_qt_executable(qmyserver_qdbusinterface SOURCES ../myobject.h qmyserver.cpp LIBRARIES + Qt::Core Qt::DBus ) + +set_target_properties(qmyserver_qdbusinterface PROPERTIES OUTPUT_NAME qmyserver) |