[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.43 1.144.2.44 ChangeLog.manual 1.1.10.41 1.1.10.42

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in changes for RC 6, fix cpack working from symlink is the only change


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.43
retrieving revision 1.144.2.44
diff -C 2 -d -r1.144.2.43 -r1.144.2.44
*** CMakeLists.txt	22 Sep 2008 14:05:16 -0000	1.144.2.43
--- CMakeLists.txt	23 Sep 2008 15:32:51 -0000	1.144.2.44
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 2)
! SET(CMake_VERSION_RC 5)
  # 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 2)
! SET(CMake_VERSION_RC 6)
  # 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.41
retrieving revision 1.1.10.42
diff -C 2 -d -r1.1.10.41 -r1.1.10.42
*** ChangeLog.manual	22 Sep 2008 14:05:16 -0000	1.1.10.41
--- ChangeLog.manual	23 Sep 2008 15:32:52 -0000	1.1.10.42
***************
*** 1,2 ****
--- 1,5 ----
+ Changes in CMake 2.6.2 RC 6
+ - Fix bug#7669 cpack did not work when sym-linked after install
+ 
  Changes in CMake 2.6.2 RC 5
  - Add beta BundleUtilities.cmake file