diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-17 14:20:38 +0200 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2019-07-17 13:25:28 +0000 |
| commit | 1035374040d030832525af611e04d59441778487 (patch) | |
| tree | 17cffd15fac5b1a39ea83f18b7cf88f821a8cd64 /tests/auto/dbus | |
| parent | ec1546afc4a5e417d37c6a14e2909b063045bf39 (diff) | |
Fix qdbusmarshall test
Fix target name for qdbushmarshall and fix missing include paths and
unresolved symbols.
Change-Id: I770e190e33d1de9b9d95ee92e63d868e2337c322
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/dbus')
| -rw-r--r-- | tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt index bfa7cf0b2f..337ae47ee9 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt @@ -4,7 +4,7 @@ ## ../tst_qdbusmarshall Test: ##################################################################### -add_qt_test(../tst_qdbusmarshall +add_qt_test(tst_qdbusmarshall SOURCES ../tst_qdbusmarshall.cpp LIBRARIES @@ -15,12 +15,21 @@ add_qt_test(../tst_qdbusmarshall ## Scopes: ##################################################################### -extend_target(../tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked +extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked DEFINES QT_LINKED_LIBDBUS ) -extend_target(../tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked +# 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. +extend_target(tst_qdbusmarshall CONDITION QT_FEATURE_dbus_linked + LIBRARIES + dbus-1 +) +# special case end + +extend_target(tst_qdbusmarshall CONDITION NOT QT_FEATURE_dbus_linked SOURCES ../../../../../src/dbus/qdbus_symbols.cpp ) |