From c77c92791c3a1d80e691c70b6018e51bdcf4e465 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 20 Apr 2020 22:07:57 +0200 Subject: FindSquish: Fix setting the application under test The AUT (application under test) was previously set by trying to extract the target location, which is no longer supported. --- Modules/FindSquish.cmake | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/Modules/FindSquish.cmake b/Modules/FindSquish.cmake index e6f3ad4..eec8876 100644 --- a/Modules/FindSquish.cmake +++ b/Modules/FindSquish.cmake @@ -260,10 +260,6 @@ function(SQUISH_V4_ADD_TEST testName) message(FATAL_ERROR "Required argument TEST not given for SQUISH_ADD_TEST()") endif() - get_target_property(testAUTLocation ${_SQUISH_AUT} LOCATION) - get_filename_component(testAUTDir ${testAUTLocation} PATH) - get_filename_component(testAUTName ${testAUTLocation} NAME) - get_filename_component(absTestSuite "${_SQUISH_SUITE}" ABSOLUTE) if(NOT EXISTS "${absTestSuite}") message(FATAL_ERROR "Could not find squish test suite ${_SQUISH_SUITE} (checked ${absTestSuite})") @@ -278,11 +274,11 @@ function(SQUISH_V4_ADD_TEST testName) set(_SQUISH_SETTINGSGROUP "CTest_$ENV{LOGNAME}") endif() - add_test(${testName} - ${CMAKE_COMMAND} -V -VV + add_test(NAME ${testName} + COMMAND ${CMAKE_COMMAND} -V -VV "-Dsquish_version:STRING=4" - "-Dsquish_aut:STRING=${testAUTName}" - "-Dsquish_aut_dir:STRING=${testAUTDir}" + "-Dsquish_aut:STRING=$" + "-Dsquish_aut_dir:STRING=$" "-Dsquish_server_executable:STRING=${SQUISH_SERVER_EXECUTABLE}" "-Dsquish_client_executable:STRING=${SQUISH_CLIENT_EXECUTABLE}" "-Dsquish_libqtdir:STRING=${QT_LIBRARY_DIR}" -- cgit v0.12