[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.22 1.97.2.23 ChangeLog.manual 1.1.8.28 1.1.8.29

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.22
retrieving revision 1.97.2.23
diff -u -d -r1.97.2.22 -r1.97.2.23
--- CMakeLists.txt	3 Jan 2007 15:19:03 -0000	1.97.2.22
+++ CMakeLists.txt	3 Jan 2007 21:09:14 -0000	1.97.2.23
@@ -7,7 +7,7 @@
 SET(CMake_VERSION_MINOR 4)
 SET(CMake_VERSION_PATCH 6)
 # for an actual release this should not be defined
-SET(CMake_VERSION_RC 1)
+SET(CMake_VERSION_RC 2)
 SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
 SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
 

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.8.28
retrieving revision 1.1.8.29
diff -u -d -r1.1.8.28 -r1.1.8.29
--- ChangeLog.manual	3 Jan 2007 15:19:03 -0000	1.1.8.28
+++ ChangeLog.manual	3 Jan 2007 21:09:14 -0000	1.1.8.29
@@ -1,4 +1,17 @@
 Changes in CMake 2.4.6
+
+* Remove svn test in ctestctest3 
+
+* Fix for FIND_* order and framworks with PREFIX usage.
+
+* Fix for FindDoxygen and quiet mode.
+
+* Find JavaVM as well as jvm
+
+* Look for ruby1.8 and ruby
+
+* Fix for cpack .tgz.sh and dash
+
 * Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR.
 
 * Fix for Borland make and custom commands that do nothing