diff options
Diffstat (limited to 'tests/auto/dbus/qdbusinterface')
-rw-r--r-- | tests/auto/dbus/qdbusinterface/CMakeLists.txt | 41 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt | 19 | ||||
-rw-r--r-- | tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp | 2 |
3 files changed, 61 insertions, 1 deletions
diff --git a/tests/auto/dbus/qdbusinterface/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/CMakeLists.txt new file mode 100644 index 0000000000..c96944cd56 --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/CMakeLists.txt @@ -0,0 +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::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/qdbusinterface/qmyserver/CMakeLists.txt b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt new file mode 100644 index 0000000000..fdbe587785 --- /dev/null +++ b/tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt @@ -0,0 +1,19 @@ +# Generated from qmyserver.pro. + +##################################################################### +## qmyserver Binary: +##################################################################### + +# 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 + NO_INSTALL # special case + OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} # special case + SOURCES + ../myobject.h + qmyserver.cpp + LIBRARIES + Qt::Core + Qt::DBus +) diff --git a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp index 05480c6dd2..ca3b779fea 100644 --- a/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp +++ b/tests/auto/dbus/qdbusinterface/tst_qdbusinterface.cpp @@ -270,7 +270,7 @@ void tst_QDBusInterface::initTestCase() # define EXE "" #endif proc.setProcessChannelMode(QProcess::ForwardedErrorChannel); - proc.start(QFINDTESTDATA("qmyserver/qmyserver" EXE)); + proc.start(QFINDTESTDATA("qmyserver/qmyserver_qdbusinterface" EXE)); // FIXME CMake: This is most probably wrong now since the binary ends up in bin/ not in the build tree QVERIFY2(proc.waitForStarted(), qPrintable(proc.errorString())); QVERIFY(proc.waitForReadyRead()); |