diff options
| author | Brad King <brad.king@kitware.com> | 2012-08-14 12:31:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-08-14 12:31:45 (GMT) |
| commit | cd3bd23266a4a6c00595134a17a8bdaea9e28af5 (patch) | |
| tree | 515fcf4fdee211067497339acb52de321640c4fc /Modules/FindSelfPackers.cmake | |
| parent | 9acb4f118cd9a52aaa66897b1c0cd11dace3851c (diff) | |
| parent | 68bc863d5bd64f3e893722e403d4fd56bd2e175a (diff) | |
| download | CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.zip CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.gz CMake-cd3bd23266a4a6c00595134a17a8bdaea9e28af5.tar.bz2 | |
Merge topic 'cleanup-style'
68bc863 Merge branch 'master' into cleanup-style
a05eba5 CMakeVersion.bash: Update sed expression for lower-case 'set'
3c0488d Fix WarnUnusedUnusedViaUnset test pass/fail regex
6c2c483 Remove trailing TAB from NSIS.template.in
9db3116 Remove CMake-language block-end command arguments
77543bd Convert CMake-language commands to lower case
7bbaa42 Remove trailing whitespace from most CMake and C/C++ code
be9db98 Merge topic 'watcom-compiler-version'
af42ae4 Watcom: Simplify compiler version detection (#11866)
Diffstat (limited to 'Modules/FindSelfPackers.cmake')
| -rw-r--r-- | Modules/FindSelfPackers.cmake | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Modules/FindSelfPackers.cmake b/Modules/FindSelfPackers.cmake index d9dc25c..7726dce 100644 --- a/Modules/FindSelfPackers.cmake +++ b/Modules/FindSelfPackers.cmake @@ -18,27 +18,27 @@ # (To distribute this file outside of CMake, substitute the full # License text for the above reference.) -INCLUDE(FindCygwin) +include(FindCygwin) -FIND_PROGRAM(SELF_PACKER_FOR_EXECUTABLE +find_program(SELF_PACKER_FOR_EXECUTABLE upx ${CYGWIN_INSTALL_PATH}/bin /bin - /usr/bin + /usr/bin /usr/local/bin /sbin ) -FIND_PROGRAM(SELF_PACKER_FOR_SHARED_LIB +find_program(SELF_PACKER_FOR_SHARED_LIB upx ${CYGWIN_INSTALL_PATH}/bin /bin - /usr/bin + /usr/bin /usr/local/bin /sbin ) -MARK_AS_ADVANCED( +mark_as_advanced( SELF_PACKER_FOR_EXECUTABLE SELF_PACKER_FOR_SHARED_LIB ) @@ -46,23 +46,23 @@ MARK_AS_ADVANCED( # # Set flags # -IF (SELF_PACKER_FOR_EXECUTABLE MATCHES "upx") - SET (SELF_PACKER_FOR_EXECUTABLE_FLAGS "-q" CACHE STRING +if (SELF_PACKER_FOR_EXECUTABLE MATCHES "upx") + set (SELF_PACKER_FOR_EXECUTABLE_FLAGS "-q" CACHE STRING "Flags for the executable self-packer.") -ELSE (SELF_PACKER_FOR_EXECUTABLE MATCHES "upx") - SET (SELF_PACKER_FOR_EXECUTABLE_FLAGS "" CACHE STRING +else () + set (SELF_PACKER_FOR_EXECUTABLE_FLAGS "" CACHE STRING "Flags for the executable self-packer.") -ENDIF (SELF_PACKER_FOR_EXECUTABLE MATCHES "upx") +endif () -IF (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") - SET (SELF_PACKER_FOR_SHARED_LIB_FLAGS "-q" CACHE STRING +if (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") + set (SELF_PACKER_FOR_SHARED_LIB_FLAGS "-q" CACHE STRING "Flags for the shared lib self-packer.") -ELSE (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") - SET (SELF_PACKER_FOR_SHARED_LIB_FLAGS "" CACHE STRING +else () + set (SELF_PACKER_FOR_SHARED_LIB_FLAGS "" CACHE STRING "Flags for the shared lib self-packer.") -ENDIF (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") +endif () -MARK_AS_ADVANCED( +mark_as_advanced( SELF_PACKER_FOR_EXECUTABLE_FLAGS SELF_PACKER_FOR_SHARED_LIB_FLAGS ) |