1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Enable qdbusinterface test

Browse Source 
Change-Id: Ia25911216790abdf463306cdb2e9aecb7dcd276e
Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Albert Astals Cid 2019-01-31 10:22:33 +01:00
parent 743b3d8673
commit f80a37dcca
4 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/dbus/CMakeLists.txt
View File

@ -20,7 +20,7 @@ add_subdirectory(qdbusthreading)
if(QT_FEATURE_process) if(QT_FEATURE_process)
add_subdirectory(qdbusabstractadaptor) add_subdirectory(qdbusabstractadaptor)
add_subdirectory(qdbusabstractinterface) add_subdirectory(qdbusabstractinterface)
# missing add_qt_binary: add_subdirectory("qdbusinterface") add_subdirectory(qdbusinterface)
if(QT_FEATURE_private_tests) if(QT_FEATURE_private_tests)
add_subdirectory(qdbusmarshall) add_subdirectory(qdbusmarshall)

24
tests/auto/dbus/qdbusinterface/CMakeLists.txt
View File

@ -1,4 +1,26 @@
# Generated from qdbusinterface.pro. # Generated from qdbusinterface.pro.
add_subdirectory(qmyserver) 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
)

28
tests/auto/dbus/qdbusinterface/qdbusinterface/CMakeLists.txt
View File

@ -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
)

8
tests/auto/dbus/qdbusinterface/qmyserver/CMakeLists.txt
View File

@ -4,10 +4,16 @@
## qmyserver Binary: ## 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 SOURCES
../myobject.h ../myobject.h
qmyserver.cpp qmyserver.cpp
LIBRARIES LIBRARIES
Qt::Core
Qt::DBus Qt::DBus
) )
set_target_properties(qmyserver_qdbusinterface PROPERTIES OUTPUT_NAME qmyserver)