diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2001-12-04 10:55:17 -0500 |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2001-12-04 10:55:17 -0500 |
| commit | cb4f04c94e5815393e9b1d765588c23656149b4e (patch) | |
| tree | e1586635e8c85d0e88faf7b42451f9d8f2de40ca /Modules/FindUnixCommands.cmake | |
| parent | f68e64e2d8488a57740cc5b2fb0f914a769c4e8e (diff) | |
| download | cmake-cb4f04c94e5815393e9b1d765588c23656149b4e.tar.gz | |
Remove unneeded test and code duplication. Add WIN32 test. Make all ADVANCED.
Diffstat (limited to 'Modules/FindUnixCommands.cmake')
| -rw-r--r-- | Modules/FindUnixCommands.cmake | 163 |
1 files changed, 74 insertions, 89 deletions
diff --git a/Modules/FindUnixCommands.cmake b/Modules/FindUnixCommands.cmake index c402ad53c9..568f3bc463 100644 --- a/Modules/FindUnixCommands.cmake +++ b/Modules/FindUnixCommands.cmake @@ -4,92 +4,77 @@ INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) -IF (CYGWIN_INSTALL_PATH) - - FIND_PROGRAM(BASH - bash - ${CYGWIN_INSTALL_PATH}/bin - ) - - FIND_PROGRAM(CP - cp - ${CYGWIN_INSTALL_PATH}/bin - ) - - FIND_PROGRAM(GZIP - gzip - ${CYGWIN_INSTALL_PATH}/bin - ) - - FIND_PROGRAM(MV - mv - ${CYGWIN_INSTALL_PATH}/bin - ) - - FIND_PROGRAM(RM - rm - ${CYGWIN_INSTALL_PATH}/bin - ) - - FIND_PROGRAM(TAR - NAMES - tar - gtar - PATH - ${CYGWIN_INSTALL_PATH}/bin - ) - -ELSE (CYGWIN_INSTALL_PATH) - - FIND_PROGRAM(BASH - bash - /bin - /usr/bin - /usr/local/bin - /sbin - ) - - FIND_PROGRAM(CP - cp - /bin - /usr/bin - /usr/local/bin - /sbin - ) - - FIND_PROGRAM(GZIP - gzip - /bin - /usr/bin - /usr/local/bin - /sbin - ) - - FIND_PROGRAM(MV - mv - /bin - /usr/bin - /usr/local/bin - /sbin - ) - - FIND_PROGRAM(RM - rm - /bin - /usr/bin - /usr/local/bin - /sbin - ) - - FIND_PROGRAM(TAR - NAMES - tar - gtar - PATH - /bin - /usr/bin - /usr/local/bin - /sbin - ) - -ENDIF (CYGWIN_INSTALL_PATH) +FIND_PROGRAM(BASH + bash + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + BASH +) + +FIND_PROGRAM(CP + cp + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + CP +) + +FIND_PROGRAM(GZIP + gzip + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + GZIP +) + +FIND_PROGRAM(MV + mv + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + MV +) + +FIND_PROGRAM(RM + rm + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + RM +) + +FIND_PROGRAM(TAR + NAMES + tar + gtar + PATH + ${CYGWIN_INSTALL_PATH}/bin + /bin + /usr/bin + /usr/local/bin + /sbin +) +MARK_AS_ADVANCED( + TAR +) |