[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.21 1.97.2.22 ChangeLog.manual 1.1.8.27 1.1.8.28

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in fixes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.21
retrieving revision 1.97.2.22
diff -u -d -r1.97.2.21 -r1.97.2.22
--- CMakeLists.txt	4 Dec 2006 14:58:27 -0000	1.97.2.21
+++ CMakeLists.txt	3 Jan 2007 15:19:03 -0000	1.97.2.22
@@ -5,9 +5,9 @@
 # The CMake version number.
 SET(CMake_VERSION_MAJOR 2)
 SET(CMake_VERSION_MINOR 4)
-SET(CMake_VERSION_PATCH 5)
+SET(CMake_VERSION_PATCH 6)
 # for an actual release this should not be defined
-#SET(CMake_VERSION_RC 4)
+SET(CMake_VERSION_RC 1)
 SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
 SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
 

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.8.27
retrieving revision 1.1.8.28
diff -u -d -r1.1.8.27 -r1.1.8.28
--- ChangeLog.manual	1 Dec 2006 16:04:22 -0000	1.1.8.27
+++ ChangeLog.manual	3 Jan 2007 15:19:03 -0000	1.1.8.28
@@ -1,3 +1,9 @@
+Changes in CMake 2.4.6
+* Fix for finding custom commands from a full path with CMAKE_CFG_INTDIR.
+
+* Fix for Borland make and custom commands that do nothing
+
+
 Changes in CMake 2.4.5
 * Fix for seg fault when a macro runs a bad command BUG# 3815