diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-30 14:06:48 +0100 |
|---|---|---|
| committer | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-30 16:15:08 +0000 |
| commit | e2dc030ac025cbc98ae95b588550ae974d0deca0 (patch) | |
| tree | 96c8e9b390c478affef29d84410855296516de4a /tests/auto | |
| parent | 7d5978df7c22749cd11ce00bb36042a7decd9ad1 (diff) | |
cmake: test: Enable the build of qdbusabstractinterface
Since the code wants pinger_interface.h as include
name and the qt_create_qdbusxml2cpp_command function was
using the filename as source for the next filename i introduced
a new option DBUS_ADAPTOR_BASENAME/DBUS_INTERFACE_BASENAME to set the
name of the resulting file
Change-Id: I582d578b68275e4530e91a88631ae43fd1ae06fd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'tests/auto')
4 files changed, 20 insertions, 15 deletions
diff --git a/tests/auto/dbus/CMakeLists.txt b/tests/auto/dbus/CMakeLists.txt index 996304127b..348c9c461c 100644 --- a/tests/auto/dbus/CMakeLists.txt +++ b/tests/auto/dbus/CMakeLists.txt @@ -19,7 +19,7 @@ add_subdirectory(qdbusthreading) if(QT_FEATURE_process) add_subdirectory(qdbusabstractadaptor) - # missing add_qt_binary: add_subdirectory("qdbusabstractinterface") + add_subdirectory(qdbusabstractinterface) # missing add_qt_binary: add_subdirectory("qdbusinterface") if(QT_FEATURE_private_tests) diff --git a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt index 111012aba9..facac1a7fc 100644 --- a/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/CMakeLists.txt @@ -1,4 +1,21 @@ # Generated from qdbusabstractinterface.pro. add_subdirectory(qpinger) -add_subdirectory(qdbusabstractinterface) + +add_qt_test(tst_qdbusabstractinterface + SOURCES + interface.cpp + tst_qdbusabstractinterface.cpp + LIBRARIES + Qt::Core + Qt::DBus +) + +extend_target(tst_qdbusabstractinterface + DBUS_INTERFACE_SOURCES + org.qtproject.QtDBus.Pinger.xml + DBUS_INTERFACE_BASENAME + pinger_interface + DBUS_INTERFACE_FLAGS + -i interface.h +) diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt deleted file mode 100644 index 5bbd2ebbaa..0000000000 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ -# Generated from qdbusabstractinterface.pro. - -##################################################################### -## ../tst_qdbusabstractinterface Test: -##################################################################### - -add_qt_test(../tst_qdbusabstractinterface - SOURCES - ../interface.cpp ../interface.h - ../tst_qdbusabstractinterface.cpp - LIBRARIES - Qt::DBus -) diff --git a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt index 91427dacab..c2bf6ea3e3 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt +++ b/tests/auto/dbus/qdbusabstractinterface/qpinger/CMakeLists.txt @@ -9,5 +9,6 @@ add_qt_executable(qpinger ../interface.cpp ../interface.h qpinger.cpp LIBRARIES + Qt::Core Qt::DBus ) |