diff options
| author | Marijn Kruisselbrink <m.kruisselbrink@student.tue.nl> | 2008-01-12 11:39:43 +0000 |
|---|---|---|
| committer | Marijn Kruisselbrink <m.kruisselbrink@student.tue.nl> | 2008-01-12 11:39:43 +0000 |
| commit | 8a7b4a66fe530d8507a1bb91fdf8705d33d662bb (patch) | |
| tree | 9e09b57e6a8d64eb6432ef0b9f98277628feb604 | |
| parent | 4ef7aebc8ec6c2a4b9fce9c9bc2d9ed5c7756149 (diff) | |
| download | extra-cmake-modules-8a7b4a66fe530d8507a1bb91fdf8705d33d662bb.tar.gz extra-cmake-modules-8a7b4a66fe530d8507a1bb91fdf8705d33d662bb.tar.bz2 | |
backport 759619: make kde4_add_unit_test work properly on OSX together with non-NOGUI tests. I'm not entirely convinced this is the best way to fix it, but it seems to work fine (and it is at least better than the current situation).
svn path=/branches/KDE/4.0/kdelibs/; revision=760256
| -rw-r--r-- | modules/KDE4Macros.cmake | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 4f4e0a9f..435fc15a 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -749,6 +749,13 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME) set(_targetName ${ARGV2}) list(REMOVE_AT _srcList 0 1) endif( ${ARGV1} STREQUAL "TESTNAME" ) + + set(_nogui) + list(GET ${_srcList} 0 first_PARAM) + if( ${first_PARAM} STREQUAL "NOGUI" ) + set(_nogui "NOGUI") + endif( ${first_PARAM} STREQUAL "NOGUI" ) + kde4_add_executable( ${_test_NAME} TEST ${_srcList} ) if(NOT KDE4_TEST_OUTPUT) @@ -766,12 +773,17 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME) endif(NOT using_qtest) endforeach(_filename) + set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}) + if (Q_WS_MAC AND NOT _nogui) + set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME}.app/Contents/MacOS/${_test_NAME}) + endif (Q_WS_MAC AND NOT _nogui) + if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") #MESSAGE(STATUS "${_targetName} : Using QTestLib, can produce XML report.") - add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_targetName}.tml) + add_test( ${_targetName} ${_executable} -xml -o ${_targetName}.tml) else (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") #MESSAGE(STATUS "${_targetName} : NOT using QTestLib, can't produce XML report, please use QTestLib to write your unit tests.") - add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} ) + add_test( ${_targetName} ${_executable} ) endif (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml") # add_test( ${_targetName} ${EXECUTABLE_OUTPUT_PATH}/${_test_NAME} -xml -o ${_test_NAME}.tml ) |