[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.19 1.144.2.20 ChangeLog.manual 1.1.10.18 1.1.10.19

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	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.144.2.19
retrieving revision 1.144.2.20
diff -C 2 -d -r1.144.2.19 -r1.144.2.20
*** CMakeLists.txt	1 May 2008 16:35:38 -0000	1.144.2.19
--- CMakeLists.txt	4 May 2008 22:07:27 -0000	1.144.2.20
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 10)
  # 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 101)
  # 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.18
retrieving revision 1.1.10.19
diff -C 2 -d -r1.1.10.18 -r1.1.10.19
*** ChangeLog.manual	1 May 2008 16:35:38 -0000	1.1.10.18
--- ChangeLog.manual	4 May 2008 22:07:27 -0000	1.1.10.19
***************
*** 1,2 ****
--- 1,6 ----
+ Changes in CMake 2.6.0
+ - Fix for FindQt and some mac frameworks
+ - Fix for ctest to report more than 2 gigs system memory on windows
+ - Fix CTest build name for vs 9, and fix memory size on windows
  Changes in CMake 2.6.0 RC 10
  - Do not duplicate .so libraries on the link line