[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.17 1.97.2.18 ChangeLog.manual 1.1.8.24 1.1.8.25

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: put fix for foo.dll.lib problem on branch with test


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.17
retrieving revision 1.97.2.18
diff -u -d -r1.97.2.17 -r1.97.2.18
--- CMakeLists.txt	28 Nov 2006 21:03:51 -0000	1.97.2.17
+++ CMakeLists.txt	30 Nov 2006 15:12:55 -0000	1.97.2.18
@@ -7,7 +7,7 @@
 SET(CMake_VERSION_MINOR 4)
 SET(CMake_VERSION_PATCH 5)
 # for an actual release this should not be defined
-SET(CMake_VERSION_RC 1)
+SET(CMake_VERSION_RC 2)
 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.24
retrieving revision 1.1.8.25
diff -u -d -r1.1.8.24 -r1.1.8.25
--- ChangeLog.manual	28 Nov 2006 19:19:43 -0000	1.1.8.24
+++ ChangeLog.manual	30 Nov 2006 15:12:55 -0000	1.1.8.25
@@ -1,8 +1,10 @@
 Changes in CMake 2.4.5
+* Fix problem with LIBRARY_OUTPUT_PATH and linking to a dll foo.dll.lib 
+  instead of foo.lib
 
 * Do not depend on optimized libraries for a debug build and visa versa.
 
-* Fix target name matching custom command output
+* Fix target name matching custom command output conflict.
    
 * Fix FindQt3 so that it does not find qt4