[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.26 1.144.2.27 ChangeLog.manual 1.1.10.25 1.1.10.26

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: check in RC 6 merges from trunk


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.26
retrieving revision 1.144.2.27
diff -C 2 -d -r1.144.2.26 -r1.144.2.27
*** CMakeLists.txt	25 Jun 2008 13:51:31 -0000	1.144.2.26
--- CMakeLists.txt	30 Jun 2008 20:10:26 -0000	1.144.2.27
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! 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 1)
! 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.25
retrieving revision 1.1.10.26
diff -C 2 -d -r1.1.10.25 -r1.1.10.26
*** ChangeLog.manual	25 Jun 2008 13:51:31 -0000	1.1.10.25
--- ChangeLog.manual	30 Jun 2008 20:10:26 -0000	1.1.10.26
***************
*** 1,2 ****
--- 1,6 ----
+ Changes in CMake 2.6.1 RC 6
+ - Fix DEFINITIONS property to be compatible with 2.4
+ - Fix escaping of $ for visual studio
+ - FindGettext.cmake  fix bug #7230: don't ignore first parameter if it's not ALL
  Changes in CMake 2.6.1 RC 5
  - Add support for component based packages in cpack.