[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.13 1.144.2.14 ChangeLog.manual 1.1.10.11 1.1.10.12

[cmake-commits at cmake.org]

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

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.13
retrieving revision 1.144.2.14
diff -C 2 -d -r1.144.2.13 -r1.144.2.14
*** CMakeLists.txt	21 Apr 2008 00:44:50 -0000	1.144.2.13
--- CMakeLists.txt	21 Apr 2008 19:21:52 -0000	1.144.2.14
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 81)
  # 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 82)
  # 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.11
retrieving revision 1.1.10.12
diff -C 2 -d -r1.1.10.11 -r1.1.10.12
*** ChangeLog.manual	21 Apr 2008 00:44:50 -0000	1.1.10.11
--- ChangeLog.manual	21 Apr 2008 19:21:52 -0000	1.1.10.12
***************
*** 1,3 ****
! Changes in CMake 2.6.0 RC 9
  
  - Better message in compiler ABI detect
--- 1,9 ----
! Changes in CMake 2.6.0 RC 82
! - Fix bug 6440, and make sure _INIT flags do not overright cache values
! - Do not report CMP0003 for anything other than -l
! - Fix crash in fortran depend scanning, bug 6855
! - Fix timeout values for cmake's own tests
! 
! Changes in CMake 2.6.0 RC 81
  
  - Better message in compiler ABI detect