diff options
| author | Frederik Gladhorn <frederik.gladhorn@remarkable.com> | 2020-04-20 20:07:57 (GMT) |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@remarkable.com> | 2020-04-20 20:20:11 (GMT) |
| commit | c77c92791c3a1d80e691c70b6018e51bdcf4e465 (patch) | |
| tree | 2aafa33c36c25d83dbdc107dab9988124cda7100 /Modules | |
| parent | 879b279154fd3b7593c80a429b4c05fcd532175b (diff) | |
| download | CMake-c77c92791c3a1d80e691c70b6018e51bdcf4e465.zip CMake-c77c92791c3a1d80e691c70b6018e51bdcf4e465.tar.gz CMake-c77c92791c3a1d80e691c70b6018e51bdcf4e465.tar.bz2 | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindSquish.cmake | 12 |
1 files 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=$<TARGET_FILE_NAME:${_SQUISH_AUT}>" + "-Dsquish_aut_dir:STRING=$<TARGET_FILE_DIR:${_SQUISH_AUT}>" "-Dsquish_server_executable:STRING=${SQUISH_SERVER_EXECUTABLE}" "-Dsquish_client_executable:STRING=${SQUISH_CLIENT_EXECUTABLE}" "-Dsquish_libqtdir:STRING=${QT_LIBRARY_DIR}" |