diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-11-25 16:48:35 +0000 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2007-11-25 16:48:35 +0000 |
| commit | 81b85a5f6120c38a94583326ce96f54136e03bea (patch) | |
| tree | c10a610f40f3d84a15adae3d49e4022e647b3ff0 | |
| parent | a85c3dc5371b8d45400b894b957e9eb4e6ff98cf (diff) | |
| download | extra-cmake-modules-81b85a5f6120c38a94583326ce96f54136e03bea.tar.gz extra-cmake-modules-81b85a5f6120c38a94583326ce96f54136e03bea.tar.bz2 | |
rearrange evaluation of executable params to not forget some
svn path=/trunk/KDE/kdelibs/; revision=741409
| -rw-r--r-- | modules/KDE4Macros.cmake | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index d17def4a..029bdf93 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -658,26 +658,26 @@ macro(KDE4_CHECK_EXECUTABLE_PARAMS _output_LIST _nogui _uninst _test) set(remove 0) endif (${first_PARAM} STREQUAL "NOGUI") - if (${second_PARAM} STREQUAL "NOGUI") - set(${_nogui} "NOGUI") - set(remove 0;1) - endif (${second_PARAM} STREQUAL "NOGUI") - if (${first_PARAM} STREQUAL "RUN_UNINSTALLED") set(${_uninst} "RUN_UNINSTALLED") set(remove 0) endif (${first_PARAM} STREQUAL "RUN_UNINSTALLED") - if (${second_PARAM} STREQUAL "RUN_UNINSTALLED") - set(${_uninst} "RUN_UNINSTALLED") - set(remove 0;1) - endif (${second_PARAM} STREQUAL "RUN_UNINSTALLED") - if (${first_PARAM} STREQUAL "TEST") set(${_test} "TEST") set(remove 0) endif (${first_PARAM} STREQUAL "TEST") + if (${second_PARAM} STREQUAL "NOGUI") + set(${_nogui} "NOGUI") + set(remove 0;1) + endif (${second_PARAM} STREQUAL "NOGUI") + + if (${second_PARAM} STREQUAL "RUN_UNINSTALLED") + set(${_uninst} "RUN_UNINSTALLED") + set(remove 0;1) + endif (${second_PARAM} STREQUAL "RUN_UNINSTALLED") + if (${second_PARAM} STREQUAL "TEST") set(${_test} "TEST") set(remove 0;1) @@ -809,7 +809,7 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME) endif (_nogui) if (_uninst OR _test) - set(_type "RUN_UNINSTALLED") + set(_type "RUN_UNINSTALLED ${_type}") endif (_uninst OR _test) if (_test AND NOT KDE4_BUILD_TESTS) |