kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove unneeded test and code duplication. Add WIN32 test. Make all ADVANCED.

Browse Source
This commit is contained in:
Sebastien Barre 2001-12-04 10:55:17 -05:00
parent f68e64e2d8
commit cb4f04c94e
8 changed files with 145 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Modules/Documentation.cmake
View File

@ -7,6 +7,7 @@
# Build the documentation ? # Build the documentation ?
# #
OPTION(BUILD_DOCUMENTATION "Build the documentation (Doxygen)." OFF) OPTION(BUILD_DOCUMENTATION "Build the documentation (Doxygen)." OFF)
MARK_AS_ADVANCED(BUILD_DOCUMENTATION)
IF (BUILD_DOCUMENTATION) IF (BUILD_DOCUMENTATION)
@ -25,6 +26,11 @@ IF (BUILD_DOCUMENTATION)
OPTION(DOCUMENTATION_HTML_TARZ OPTION(DOCUMENTATION_HTML_TARZ
"Build a compressed tar archive of the HTML doc." OFF) "Build a compressed tar archive of the HTML doc." OFF)
MARK_AS_ADVANCED(
DOCUMENTATION_HTML_HELP
DOCUMENTATION_HTML_TARZ
)
# #
# The documentation process is controled by a batch file. # The documentation process is controled by a batch file.
# We will probably need bash to create the custom target # We will probably need bash to create the custom target

16
Modules/FindCygwin.cmake
View File

@ -2,8 +2,14 @@
# this module looks for Cygwin # this module looks for Cygwin
# #
FIND_PATH(CYGWIN_INSTALL_PATH IF (WIN32)
cygwin.bat FIND_PATH(CYGWIN_INSTALL_PATH
"C:/Cygwin" cygwin.bat
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]" "C:/Cygwin"
) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Cygnus Solutions\\Cygwin\\mounts v2\\/;native]"
)
MARK_AS_ADVANCED(
CYGWIN_INSTALL_PATH
)
ENDIF (WIN32)

9
Modules/FindDoxygen.cmake
View File

@ -12,7 +12,12 @@ FIND_PROGRAM(DOT
) )
# HKEY_CURRENT_USER\Software\AT&T\Graphviz # HKEY_CURRENT_USER\Software\AT&T\Graphviz
# Since most of the time dot is called by Doxygen, the path to dot is useful too # Since most of the time dot is called by Doxygen, the path to dot is
# useful too
GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH CACHE) GET_FILENAME_COMPONENT(DOT_PATH ${DOT} PATH CACHE)
MARK_AS_ADVANCED(
DOT
DOT_PATH
DOXYGEN
)

16
Modules/FindHhc.cmake
View File

@ -2,8 +2,14 @@
# this module looks for Microsoft HTML Help Compiler # this module looks for Microsoft HTML Help Compiler
# #
FIND_PROGRAM(HHC IF (WIN32)
hhc FIND_PROGRAM(HHC
"C:/Program Files/HTML Help Workshop" hhc
"[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]" "C:/Program Files/HTML Help Workshop"
) "[HKEY_CURRENT_USER\\Software\\Microsoft\\HTML Help Workshop;InstallDir]"
)
MARK_AS_ADVANCED(
HHC
)
ENDIF (WIN32)

26
Modules/FindPerl.cmake
View File

@ -4,21 +4,13 @@
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) 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
)
FIND_PROGRAM(PERL MARK_AS_ADVANCED(
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)

54
Modules/FindSelfPackers.cmake
View File

@ -8,37 +8,28 @@
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake)
IF (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_EXECUTABLE FIND_PROGRAM(SELF_PACKER_FOR_SHARED_LIB
upx upx
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
) /bin
/usr/bin
/usr/local/bin
/sbin
)
FIND_PROGRAM(SELF_PACKER_FOR_SHARED_LIB MARK_AS_ADVANCED(
upx SELF_PACKER_FOR_EXECUTABLE
${CYGWIN_INSTALL_PATH}/bin SELF_PACKER_FOR_SHARED_LIB
) )
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)
# #
# Set flags # Set flags
@ -58,3 +49,8 @@ ELSE (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx")
SET (SELF_PACKER_FOR_SHARED_LIB_FLAGS "" CACHE STRING SET (SELF_PACKER_FOR_SHARED_LIB_FLAGS "" CACHE STRING
"Flags for the shared lib self-packer.") "Flags for the shared lib self-packer.")
ENDIF (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx") ENDIF (SELF_PACKER_FOR_SHARED_LIB MATCHES "upx")
MARK_AS_ADVANCED(
SELF_PACKER_FOR_EXECUTABLE_FLAGS
SELF_PACKER_FOR_SHARED_LIB_FLAGS
)

153
Modules/FindUnixCommands.cmake
View File

@ -4,92 +4,77 @@
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake)
IF (CYGWIN_INSTALL_PATH) FIND_PROGRAM(BASH
bash
${CYGWIN_INSTALL_PATH}/bin
/bin
/usr/bin
/usr/local/bin
/sbin
)
MARK_AS_ADVANCED(
BASH
)
FIND_PROGRAM(BASH FIND_PROGRAM(CP
bash cp
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
) /bin
/usr/bin
/usr/local/bin
/sbin
)
MARK_AS_ADVANCED(
CP
)
FIND_PROGRAM(CP FIND_PROGRAM(GZIP
cp gzip
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
) /bin
/usr/bin
/usr/local/bin
/sbin
)
MARK_AS_ADVANCED(
GZIP
)
FIND_PROGRAM(GZIP FIND_PROGRAM(MV
gzip mv
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
) /bin
/usr/bin
/usr/local/bin
/sbin
)
MARK_AS_ADVANCED(
MV
)
FIND_PROGRAM(MV FIND_PROGRAM(RM
mv rm
${CYGWIN_INSTALL_PATH}/bin ${CYGWIN_INSTALL_PATH}/bin
) /bin
/usr/bin
/usr/local/bin
/sbin
)
MARK_AS_ADVANCED(
RM
)
FIND_PROGRAM(RM FIND_PROGRAM(TAR
rm NAMES
${CYGWIN_INSTALL_PATH}/bin tar
) gtar
PATH
FIND_PROGRAM(TAR ${CYGWIN_INSTALL_PATH}/bin
NAMES /bin
tar /usr/bin
gtar /usr/local/bin
PATH /sbin
${CYGWIN_INSTALL_PATH}/bin )
) MARK_AS_ADVANCED(
TAR
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)

20
Modules/FindWget.cmake
View File

@ -4,17 +4,11 @@
INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake) INCLUDE(${CMAKE_ROOT}/Modules/FindCygwin.cmake)
IF (CYGWIN_INSTALL_PATH) FIND_PROGRAM(WGET
wget
${CYGWIN_INSTALL_PATH}/bin
)
FIND_PROGRAM(WGET MARK_AS_ADVANCED(
wget WGET
${CYGWIN_INSTALL_PATH}/bin )
)
ELSE (CYGWIN_INSTALL_PATH)
FIND_PROGRAM(WGET
wget
)
ENDIF (CYGWIN_INSTALL_PATH)