determine cuke_qt runtime path for qt tests from library names as var…

…iable
cucumber · Aug 1, 2024 · 586a232 · 586a232
1 parent 8f342e9
commit 586a232
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -165,14 +165,11 @@ if(CUKE_ENABLE_QT_5)
 
     message(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
     if(Qt5Core_VERSION_STRING VERSION_LESS 5.15.0)
-        add_library(Qt::Core    INTERFACE IMPORTED)
-        add_library(Qt::Gui     INTERFACE IMPORTED)
-        add_library(Qt::Widgets INTERFACE IMPORTED)
-        add_library(Qt::Test    INTERFACE IMPORTED)
-        set_target_properties(Qt::Core    PROPERTIES INTERFACE_LINK_LIBRARIES Qt5::Core   )
-        set_target_properties(Qt::Gui     PROPERTIES INTERFACE_LINK_LIBRARIES Qt5::Gui    )
-        set_target_properties(Qt::Widgets PROPERTIES INTERFACE_LINK_LIBRARIES Qt5::Widgets)
-        set_target_properties(Qt::Test    PROPERTIES INTERFACE_LINK_LIBRARIES Qt5::Test   )
+        add_library( Qt::Core ALIAS Qt5::Core)
+        add_library( Qt::Gui ALIAS Qt5::Gui)
+        add_library( Qt::Widgets ALIAS Qt5::Widgets)
+        add_library( Qt::Test ALIAS Qt5::Test)
+        set( CUKE_QT_RUNTIME_PATH $<TARGET_FILE_DIR:Qt5::Test> )
     endif()
 endif()
 
@@ -185,6 +182,7 @@ if(CUKE_ENABLE_QT_6)
     )
 
     message(STATUS "Found Qt version: ${Qt6Core_VERSION}")
+    set( CUKE_QT_RUNTIME_PATH $<TARGET_FILE_DIR:Qt6::Test> )
 endif()
 
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -94,7 +94,7 @@ if((TARGET Qt::Test)
     AND (NOT VALGRIND_TESTS)
     )
     cuke_add_driver_test(integration/drivers/QtTestDriverTest Qt::Test)
-    cuke_set_environment( QTTEST_ENVIRONMENT RUNPATH "$<TARGET_FILE_DIR:Qt::Core>" )
+    cuke_set_environment( QTTEST_ENVIRONMENT RUNPATH "${CUKE_QT_RUNTIME_PATH}" )
     set_tests_properties(QtTestDriverTest PROPERTIES ENVIRONMENT_MODIFICATION ${QTTEST_ENVIRONMENT})
 endif()