[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.11 1.144.2.12 ChangeLog.manual 1.1.10.8 1.1.10.9

[cmake-commits at cmake.org]

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

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.11
retrieving revision 1.144.2.12
diff -C 2 -d -r1.144.2.11 -r1.144.2.12
*** CMakeLists.txt	9 Apr 2008 18:57:31 -0000	1.144.2.11
--- CMakeLists.txt	10 Apr 2008 16:43:49 -0000	1.144.2.12
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 7)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
--- 355,359 ----
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 8)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.8
retrieving revision 1.1.10.9
diff -C 2 -d -r1.1.10.8 -r1.1.10.9
*** ChangeLog.manual	9 Apr 2008 18:57:52 -0000	1.1.10.8
--- ChangeLog.manual	10 Apr 2008 16:43:49 -0000	1.1.10.9
***************
*** 1,4 ****
--- 1,6 ----
  Changes in CMake 2.6.0 RC 7
  
+ - Fix sun make very poor performance
+ - Fix includes for automoc in FindQt4
  - Fix for chrpath on sun with gcc
  - Fix FindJNI on unix with HKEY issue bug 6688