From 3714d9419c3f90a753bb7e96c9260b674f486916 Mon Sep 17 00:00:00 2001 From: Sebastien Barre Date: Fri, 2 Nov 2001 16:44:00 -0500 Subject: Move usual Unix commands to FindUnixCommands, use FingCygwin in other modules --- Modules/Documentation.cmake | 33 +++++++++++++++++ Modules/DocumentationVTK.cmake | 34 ------------------ Modules/FindCygwin.cmake | 26 +------------- Modules/FindPerl.cmake | 25 ++++++++++--- Modules/FindUnixCommands.cmake | 82 ++++++++++++++++++++++++++++++++++++++++++ Modules/FindWget.cmake | 19 ++++++++-- 6 files changed, 152 insertions(+), 67 deletions(-) create mode 100644 Modules/Documentation.cmake delete mode 100644 Modules/DocumentationVTK.cmake create mode 100644 Modules/FindUnixCommands.cmake diff --git a/Modules/Documentation.cmake b/Modules/Documentation.cmake new file mode 100644 index 0000000..c86e704 --- /dev/null +++ b/Modules/Documentation.cmake @@ -0,0 +1,33 @@ +# DocumentationVTK.cmake +# +# This file provides support for the VTK documentation framework. +# It relies on several tools (Doxygen, Perl, etc). + +# +# Build the documentation ? +# +OPTION(BUILD_DOCUMENTATION "Build the documentation (Doxygen)." OFF) + +IF (BUILD_DOCUMENTATION) + + # + # Check for the tools + # + INCLUDE(${CMAKE_ROOT}/Modules/FindUnixCommands.cmake) + INCLUDE(${CMAKE_ROOT}/Modules/FindDoxygen.cmake) + INCLUDE(${CMAKE_ROOT}/Modules/FindHhc.cmake) + INCLUDE(${CMAKE_ROOT}/Modules/FindPerl.cmake) + INCLUDE(${CMAKE_ROOT}/Modules/FindWget.cmake) + + OPTION(DOCUMENTATION_HTML_HELP + "Build the HTML Help file (CHM)." OFF) + + OPTION(DOCUMENTATION_HTML_TARZ + "Build a compressed tar archive of the HTML doc." OFF) + + # + # The documentation process is controled by a batch file. + # We will probably need bash to create the custom target + # + +ENDIF (BUILD_DOCUMENTATION) diff --git a/Modules/DocumentationVTK.cmake b/Modules/DocumentationVTK.cmake deleted file mode 100644 index 3e7b8fa..0000000 --- a/Modules/DocumentationVTK.cmake +++ /dev/null @@ -1,34 +0,0 @@ -# DocumentationVTK.cmake -# -# This file provides support for the VTK documentation framework. -# It relies on several tools (Doxygen, Perl, etc). - -# -# Build the documentation ? -# -OPTION(BUILD_DOCUMENTATION "Build the documentation (Doxygen)." OFF) - -IF (BUILD_DOCUMENTATION) - - # - # Check for the tools - # - INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindDoxygen.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindHhc.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindPerl.cmake) - INCLUDE(${CMAKE_ROOT}/Modules/FindWget.cmake) - - OPTION(DOCUMENTATION_HTML_HELP - "Build the HTML Help file (CHM)." OFF) - - OPTION(DOCUMENTATION_HTML_TARZ - "Build a compressed tar archive of the HTML doc." OFF) - - # - # The documentation process is controled by a batch file. - # We will probably need bash to create the custom target - # - FIND_PROGRAM(BASH bash) - -ENDIF (BUILD_DOCUMENTATION) diff --git a/Modules/FindCygwin.cmake b/Modules/FindCygwin.cmake index c93c7f2..7c4f8b1 100644 --- a/Modules/FindCygwin.cmake +++ b/Modules/FindCygwin.cmake @@ -1,5 +1,5 @@ # -# this module looks for Cygwin and some usual commands +# this module looks for Cygwin # FIND_PATH(CYGWIN_INSTALL_PATH @@ -7,27 +7,3 @@ FIND_PATH(CYGWIN_INSTALL_PATH "C:/Cygwin" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]" ) - -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 -) - diff --git a/Modules/FindPerl.cmake b/Modules/FindPerl.cmake index 916fcf9..79a88a1 100644 --- a/Modules/FindPerl.cmake +++ b/Modules/FindPerl.cmake @@ -2,8 +2,23 @@ # this module looks for Perl # -FIND_PROGRAM(PERL - perl - "C:/Perl/bin" - [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\628]/bin -) +INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) + +IF (CYGWIN_INSTALL_PATH) + + FIND_PROGRAM(PERL + perl + "C:/Perl/bin" + [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\628]/bin + ${CYGWIN_INSTALL_PATH}/bin + ) + +ELSE (CYGWIN_INSTALL_PATH) + + FIND_PROGRAM(PERL + perl + "C:/Perl/bin" + [HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActivePerl\\628]/bin + ) + +ENDIF (CYGWIN_INSTALL_PATH) diff --git a/Modules/FindUnixCommands.cmake b/Modules/FindUnixCommands.cmake new file mode 100644 index 0000000..4269983 --- /dev/null +++ b/Modules/FindUnixCommands.cmake @@ -0,0 +1,82 @@ +# +# this module looks for some usual Unix commands +# + +INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) + +IF (CYGWIN_INSTALL_PATH) + + FIND_PROGRAM(BASH + bash + ${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(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) diff --git a/Modules/FindWget.cmake b/Modules/FindWget.cmake index bd14eeb..5a2110c 100644 --- a/Modules/FindWget.cmake +++ b/Modules/FindWget.cmake @@ -2,6 +2,19 @@ # this module looks for wget # -FIND_PROGRAM(WGET - wget -) +INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) + +IF (CYGWIN_INSTALL_PATH) + + FIND_PROGRAM(WGET + wget + ${CYGWIN_INSTALL_PATH}/bin + ) + +ELSE (CYGWIN_INSTALL_PATH) + + FIND_PROGRAM(WGET + wget + ) + +ENDIF (CYGWIN_INSTALL_PATH) -- cgit v0.12