diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-12 18:12:15 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-13 10:11:39 +0000 |
| commit | 8305b6fe3f612e4b78b072e8bbe9d354c4a969bb (patch) | |
| tree | f69f32a206b10a407c813c41df50162deb666958 /tests/auto/dbus/qdbusmarshall | |
| parent | 0650bafa59d280e20f3025859b558962aee95257 (diff) | |
Regenerate tests/auto/dbus
Change-Id: I105eb73065e02a4fa508d17f481047b32875f128
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/dbus/qdbusmarshall')
3 files changed, 40 insertions, 9 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt new file mode 100644 index 0000000000..783607f615 --- /dev/null +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/.prev_CMakeLists.txt @@ -0,0 +1,31 @@ +# Generated from qdbusmarshall.pro. + +##################################################################### +## tst_qdbusmarshall Test: +##################################################################### + +add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" + SOURCES + ../tst_qdbusmarshall.cpp + LIBRARIES + Qt::CorePrivate + Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus +) + +## Scopes: +##################################################################### + +extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked + DEFINES + QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES + dbus-1 +) + +extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked + SOURCES + ../../../../../src/dbus/qdbus_symbols.cpp +) diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index 337ae47ee9..6bb05cafb9 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -1,33 +1,33 @@ # Generated from qdbusmarshall.pro. ##################################################################### -## ../tst_qdbusmarshall Test: +## tst_qdbusmarshall Test: ##################################################################### add_qt_test(tst_qdbusmarshall + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES ../tst_qdbusmarshall.cpp LIBRARIES Qt::CorePrivate Qt::DBusPrivate + PUBLIC_LIBRARIES + Qt::DBus ) ## Scopes: ##################################################################### -extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked - DEFINES - QT_LINKED_LIBDBUS -) - # special case begin # This test case interacts with dbus code directly via the private # headers. The include path is also not exposed via Qt:DBus. +# special case end extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked - LIBRARIES + DEFINES + QT_LINKED_LIBDBUS + PUBLIC_LIBRARIES dbus-1 ) -# special case end extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked SOURCES diff --git a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt index be61e0d4b6..e53c11aabe 100644 --- a/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qpong/CMakeLists.txt @@ -5,7 +5,7 @@ ##################################################################### add_qt_executable(qpong - OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/./" + OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES qpong.cpp PUBLIC_LIBRARIES |