diff options
| author | Allen Winter <winter@kde.org> | 2008-01-22 16:50:56 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2008-01-22 16:50:56 +0000 |
| commit | 1d22b2b487ca089f3b6d54eafc6182d120ecd757 (patch) | |
| tree | e31c0b25790bace18502ff186ab618cfccb311c1 | |
| parent | 45ef8e26553404c2df522a9d0a3801097c9f6497 (diff) | |
| download | extra-cmake-modules-1d22b2b487ca089f3b6d54eafc6182d120ecd757.tar.gz extra-cmake-modules-1d22b2b487ca089f3b6d54eafc6182d120ecd757.tar.bz2 | |
backport SVN commit 764809 by winterz:
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=/branches/KDE/4.0/kdelibs/; revision=764816
| -rw-r--r-- | modules/KDE4Macros.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index 435fc15a..4a975088 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") |