[cmake-commits] hoffman committed CPack.STGZ_Header.sh.in 1.1.2.1 1.1.2.2 FindDoxygen.cmake 1.7.2.2 1.7.2.3 FindJNI.cmake 1.25.2.2 1.25.2.3 FindRuby.cmake 1.5.2.1 1.5.2.2

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv32269/Modules

Modified Files:
      Tag: CMake-2-4
	CPack.STGZ_Header.sh.in FindDoxygen.cmake FindJNI.cmake 
	FindRuby.cmake 
Log Message:
ENH: merge from main tree


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.25.2.2
retrieving revision 1.25.2.3
diff -u -d -r1.25.2.2 -r1.25.2.3
--- FindJNI.cmake	30 Oct 2006 14:17:00 -0000	1.25.2.2
+++ FindJNI.cmake	3 Jan 2007 21:09:14 -0000	1.25.2.3
@@ -96,7 +96,7 @@
   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)

Index: FindDoxygen.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindDoxygen.cmake,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- FindDoxygen.cmake	27 Oct 2006 20:01:46 -0000	1.7.2.2
+++ FindDoxygen.cmake	3 Jan 2007 21:09:14 -0000	1.7.2.3
@@ -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)

Index: FindRuby.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindRuby.cmake,v
retrieving revision 1.5.2.1
retrieving revision 1.5.2.2
diff -u -d -r1.5.2.1 -r1.5.2.2
--- FindRuby.cmake	13 Oct 2006 14:52:01 -0000	1.5.2.1
+++ FindRuby.cmake	3 Jan 2007 21:09:14 -0000	1.5.2.2
@@ -46,7 +46,7 @@
   /usr/lib/ruby/1.8/i586-linux-gnu/ )
 
 FIND_LIBRARY(RUBY_LIBRARY
-  NAMES ruby
+  NAMES ruby ruby1.8
   PATHS ${RUBY_POSSIBLE_LIB_PATH}
   )
 

Index: CPack.STGZ_Header.sh.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CPack.STGZ_Header.sh.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- CPack.STGZ_Header.sh.in	7 May 2006 14:55:35 -0000	1.1.2.1
+++ CPack.STGZ_Header.sh.in	3 Jan 2007 21:09:14 -0000	1.1.2.2
@@ -58,7 +58,7 @@
   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 @@
 
 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 @@
     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 @@
   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}"