[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.16 1.144.2.17 ChangeLog.manual 1.1.10.14 1.1.10.15

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in some fixes from head


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.16
retrieving revision 1.144.2.17
diff -C 2 -d -r1.144.2.16 -r1.144.2.17
*** CMakeLists.txt	23 Apr 2008 12:50:37 -0000	1.144.2.16
--- CMakeLists.txt	23 Apr 2008 16:14:33 -0000	1.144.2.17
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 84)
  # 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 85)
  # 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.14
retrieving revision 1.1.10.15
diff -C 2 -d -r1.1.10.14 -r1.1.10.15
*** ChangeLog.manual	23 Apr 2008 12:50:37 -0000	1.1.10.14
--- ChangeLog.manual	23 Apr 2008 16:14:33 -0000	1.1.10.15
***************
*** 1,2 ****
--- 1,8 ----
+ Changes in CMake 2.6.0 RC 85
+ 
+ - Fix bug in install command with BUNDLE DESTINATION
+ - Make mac install symlinks check for errors
+ - Fix for CMP0007, to not warn about empty lists
+ 
  Changes in CMake 2.6.0 RC 84