From cb4f04c94e5815393e9b1d765588c23656149b4e Mon Sep 17 00:00:00 2001 From: Sebastien Barre Date: Tue, 4 Dec 2001 10:55:17 -0500 Subject: Remove unneeded test and code duplication. Add WIN32 test. Make all ADVANCED. --- Modules/FindUnixCommands.cmake | 163 +++++++++++++++++++---------------------- 1 file changed, 74 insertions(+), 89 deletions(-) (limited to 'Modules/FindUnixCommands.cmake') 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 +) -- cgit v1.2.1