diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2001-12-04 15:55:17 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2001-12-04 15:55:17 (GMT) |
| commit | cb4f04c94e5815393e9b1d765588c23656149b4e (patch) | |
| tree | e1586635e8c85d0e88faf7b42451f9d8f2de40ca /Modules/FindSelfPackers.cmake | |
| parent | f68e64e2d8488a57740cc5b2fb0f914a769c4e8e (diff) | |
| download | CMake-cb4f04c94e5815393e9b1d765588c23656149b4e.zip CMake-cb4f04c94e5815393e9b1d765588c23656149b4e.tar.gz CMake-cb4f04c94e5815393e9b1d765588c23656149b4e.tar.bz2 | |
Remove unneeded test and code duplication. Add WIN32 test. Make all ADVANCED.
Diffstat (limited to 'Modules/FindSelfPackers.cmake')
| -rw-r--r-- | Modules/FindSelfPackers.cmake | 58 |
1 files changed, 27 insertions, 31 deletions
diff --git a/Modules/FindSelfPackers.cmake b/Modules/FindSelfPackers.cmake index 2978bb7..979ebac 100644 --- a/Modules/FindSelfPackers.cmake +++ b/Modules/FindSelfPackers.cmake @@ -8,37 +8,28 @@ INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) -IF (CYGWIN_INSTALL_PATH) - - FIND_PROGRAM(SELF_PACKER_FOR_EXECUTABLE - upx - ${CYGWIN_INSTALL_PATH}/bin - ) - - FIND_PROGRAM(SELF_PACKER_FOR_SHARED_LIB - upx - ${CYGWIN_INSTALL_PATH}/bin - ) - -ELSE (CYGWIN_INSTALL_PATH) - - FIND_PROGRAM(SELF_PACKER_FOR_EXECUTABLE - upx - /bin - /usr/bin - /usr/local/bin - /sbin - ) - - FIND_PROGRAM(SELF_PACKER_FOR_SHARED_LIB - upx - /bin - /usr/bin - /usr/local/bin - /sbin - ) - -ENDIF (CYGWIN_INSTALL_PATH) +FIND_PROGRAM(SELF_PACKER_FOR_EXECUTABLE + upx + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) + +FIND_PROGRAM(SELF_PACKER_FOR_SHARED_LIB + upx + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) + +MARK_AS_ADVANCED( + SELF_PACKER_FOR_EXECUTABLE + SELF_PACKER_FOR_SHARED_LIB +) # # Set flags @@ -58,3 +49,8 @@ ELSE (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") SET (SELF_PACKER_FOR_SHARED_LIB_FLAGS "" CACHE STRING "Flags for the shared lib self-packer.") ENDIF (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") + +MARK_AS_ADVANCED( + SELF_PACKER_FOR_EXECUTABLE_FLAGS + SELF_PACKER_FOR_SHARED_LIB_FLAGS +) |