aboutsummaryrefslogtreecommitdiff
path: root/modules/KDE4Macros.cmake
diff options
context:
space:
mode:
authorAllen Winter <winter@kde.org>2008-01-22 16:40:50 +0000
committerAllen Winter <winter@kde.org>2008-01-22 16:40:50 +0000
commite2b18201c68c201b33abb0b1ac1971ef48ef1c0a (patch)
treedcb14a82e8973e6a42ec65b4fd9d20dc709e9919 /modules/KDE4Macros.cmake
parentb8f5228d282ad06a5d39b3f90ddfc8cfb60177a6 (diff)
downloadextra-cmake-modules-e2b18201c68c201b33abb0b1ac1971ef48ef1c0a.tar.gz
extra-cmake-modules-e2b18201c68c201b33abb0b1ac1971ef48ef1c0a.tar.bz2
patch by dfaure so that the testfoo.shell wrapper is used when running
'make test' on Unix. We want to do this because testfoo.shell uses the runpath that points to our builddir, rather than installdir. this way, you no longer need to run make install before running make test. as discussed on kde-buildsystem svn path=/trunk/KDE/kdelibs/; revision=764809
Diffstat (limited to 'modules/KDE4Macros.cmake')
-rw-r--r--modules/KDE4Macros.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index ffeb07c4..4d103d5e 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -776,6 +776,11 @@ macro (KDE4_ADD_UNIT_TEST _test_NAME)
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})
+ else (Q_WS_MAC AND NOT _nogui)
+ # Use .shell wrapper where available, to use uninstalled libs.
+ if (UNIX)
+ set(_executable ${_executable}.shell)
+ endif (UNIX)
endif (Q_WS_MAC AND NOT _nogui)
if (using_qtest AND KDE4_TEST_OUTPUT STREQUAL "xml")