diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2007-01-03 21:09:14 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2007-01-03 21:09:14 (GMT) |
| commit | 99d60a6ded9a2e6a09f68127d06562994fd98d40 (patch) | |
| tree | 3d087ffba55a26b63e4548c42e27c39c47849edb /Modules | |
| parent | 1529dfaa2f7f79d7e8b549e7b3d3d3d015bf1f70 (diff) | |
| download | CMake-99d60a6ded9a2e6a09f68127d06562994fd98d40.zip CMake-99d60a6ded9a2e6a09f68127d06562994fd98d40.tar.gz CMake-99d60a6ded9a2e6a09f68127d06562994fd98d40.tar.bz2 | |
ENH: merge from main tree
Diffstat (limited to 'Modules')
| -rwxr-xr-x | Modules/CPack.STGZ_Header.sh.in | 8 | ||||
| -rw-r--r-- | Modules/FindDoxygen.cmake | 7 | ||||
| -rw-r--r-- | Modules/FindJNI.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindRuby.cmake | 2 |
4 files changed, 13 insertions, 6 deletions
diff --git a/Modules/CPack.STGZ_Header.sh.in b/Modules/CPack.STGZ_Header.sh.in index 1325239..7044be8 100755 --- a/Modules/CPack.STGZ_Header.sh.in +++ b/Modules/CPack.STGZ_Header.sh.in @@ -58,7 +58,7 @@ for a in "$@CPACK_AT_SIGN@"; do fi done -if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" == "xTRUEx" ] +if [ "x${cpack_include_subdir}x" != "xx" -o "x${cpack_skip_license}x" = "xTRUEx" ] then interactive=FALSE fi @@ -73,7 +73,7 @@ fi echo "The archive will be extracted to: ${toplevel}" -if [ "x${interactive}x" == "xTRUEx" ] +if [ "x${interactive}x" = "xTRUEx" ] then echo "" echo "If you want to stop extracting, please press <ctrl-C>." @@ -95,7 +95,7 @@ ____cpack__here_doc____ esac fi - if [ "x${cpack_include_subdir}x" == "xx" ] + if [ "x${cpack_include_subdir}x" = "xx" ] then echo "By default the @CPACK_PACKAGE_NAME@ will be installed in:" echo " \"${toplevel}/@CPACK_PACKAGE_FILE_NAME@\"" @@ -110,7 +110,7 @@ ____cpack__here_doc____ fi fi -if [ "x${cpack_include_subdir}x" == "xTRUEx" ] +if [ "x${cpack_include_subdir}x" = "xTRUEx" ] then toplevel="${toplevel}/@CPACK_PACKAGE_FILE_NAME@" mkdir -p "${toplevel}" diff --git a/Modules/FindDoxygen.cmake b/Modules/FindDoxygen.cmake index 5d4554b..b489a49 100644 --- a/Modules/FindDoxygen.cmake +++ b/Modules/FindDoxygen.cmake @@ -23,6 +23,13 @@ SET(TEMP_DOXYGEN_SAVE_CMAKE_FIND_APPBUNDLE ${CMAKE_FIND_APPBUNDLE}) # Disable the App-bundle detection feature SET(CMAKE_FIND_APPBUNDLE "NEVER") +# For backwards compatibility support +# DOXYGEN_FIND_QUIETLY, but it should have been +# Doxygen_FIND_QUIETLY. +IF(Doxygen_FIND_QUIETLY) + SET(DOXYGEN_FIND_QUIETLY TRUE) +ENDIF(Doxygen_FIND_QUIETLY) + IF (NOT DOXYGEN_FIND_QUIETLY) MESSAGE(STATUS "Looking for doxygen...") ENDIF (NOT DOXYGEN_FIND_QUIETLY) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 694bc96..45e6c20 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -96,7 +96,7 @@ ELSE(APPLE) FIND_LIBRARY(JAVA_AWT_LIBRARY jawt PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES} ) - FIND_LIBRARY(JAVA_JVM_LIBRARY jvm + FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES} ) ENDIF(APPLE) diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake index 943b131..44fc462 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake @@ -46,7 +46,7 @@ FIND_PATH(RUBY_INCLUDE_PATH /usr/lib/ruby/1.8/i586-linux-gnu/ ) FIND_LIBRARY(RUBY_LIBRARY - NAMES ruby + NAMES ruby ruby1.8 PATHS ${RUBY_POSSIBLE_LIB_PATH} ) |