From 1035374040d030832525af611e04d59441778487 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Wed, 17 Jul 2019 14:20:38 +0200 Subject: Fix qdbusmarshall test Fix target name for qdbushmarshall and fix missing include paths and unresolved symbols. Change-Id: I770e190e33d1de9b9d95ee92e63d868e2337c322 Reviewed-by: Simon Hausmann --- .../auto/dbus/qdbusmarshall/qdbusmarshall/CMakeLists.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tests/auto/dbus/qdbusmarshall/qdbusmarshall') 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 ) -- cgit v1.2.3