[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.30 1.144.2.31 ChangeLog.manual 1.1.10.29 1.1.10.30

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in two bug fixes to 26


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.30
retrieving revision 1.144.2.31
diff -C 2 -d -r1.144.2.30 -r1.144.2.31
*** CMakeLists.txt	15 Jul 2008 15:35:46 -0000	1.144.2.30
--- CMakeLists.txt	17 Jul 2008 14:14:25 -0000	1.144.2.31
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 9)
  # 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 1)
! SET(CMake_VERSION_RC 10)
  # 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.29
retrieving revision 1.1.10.30
diff -C 2 -d -r1.1.10.29 -r1.1.10.30
*** ChangeLog.manual	15 Jul 2008 15:35:46 -0000	1.1.10.29
--- ChangeLog.manual	17 Jul 2008 14:14:25 -0000	1.1.10.30
***************
*** 1,2 ****
--- 1,6 ----
+ Changes in CMake 2.6.1 RC 10
+ - Add a fix for bug # 7340, CMAKE_USER_MAKE_RULES_OVERRIDE was
+   not able to support a try-compile in cmake 2.6
+ - Remove bad test for bug  # 7316 
  Changes in CMake 2.6.1 RC 9
  - Fix bug # 7316 Xcode double escaped define strings