[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.53 1.144.2.54 ChangeLog.manual 1.1.10.50 1.1.10.51

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in changes from main tree, fix borland build


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.53
retrieving revision 1.144.2.54
diff -C 2 -d -r1.144.2.53 -r1.144.2.54
*** CMakeLists.txt	13 Jan 2009 18:03:48 -0000	1.144.2.53
--- CMakeLists.txt	15 Jan 2009 14:17:20 -0000	1.144.2.54
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 3)
! SET(CMake_VERSION_RC 8)
  # 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 3)
! SET(CMake_VERSION_RC 9)
  # 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.50
retrieving revision 1.1.10.51
diff -C 2 -d -r1.1.10.50 -r1.1.10.51
*** ChangeLog.manual	13 Jan 2009 18:03:48 -0000	1.1.10.50
--- ChangeLog.manual	15 Jan 2009 14:17:20 -0000	1.1.10.51
***************
*** 1,2 ****
--- 1,7 ----
+ Changes in CMake 2.6.3 RC 9
+ - Fix borland 55 build
+ - Pop a function scope even on error
+ - Provide variable CMAKE_VERSION
+ 
  Changes in CMake 2.6.3 RC 8
  - CMAKE_VERBOSE_MAKEFILE fix for KDevelop3