[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.36 1.144.2.37 ChangeLog.manual 1.1.10.35 1.1.10.36

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in stuff from cvs head RC 16 


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.36
retrieving revision 1.144.2.37
diff -C 2 -d -r1.144.2.36 -r1.144.2.37
*** CMakeLists.txt	30 Jul 2008 18:54:49 -0000	1.144.2.36
--- CMakeLists.txt	31 Jul 2008 15:52:24 -0000	1.144.2.37
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 15)
  # 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 16)
  # 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.35
retrieving revision 1.1.10.36
diff -C 2 -d -r1.1.10.35 -r1.1.10.36
*** ChangeLog.manual	30 Jul 2008 18:54:49 -0000	1.1.10.35
--- ChangeLog.manual	31 Jul 2008 15:52:24 -0000	1.1.10.36
***************
*** 1,2 ****
--- 1,9 ----
+ Changes in CMake 2.6.1 RC 16
+ - Fix for bug 7427, preinstall target name hard coded
+ - Fix issue #7088 - do not emit error messages when attempts to run 
+   Visual Studio macros fail. You can still get the error output
+   as messages if you want using --debug-output from the cmake command line.
+ - Fix InstallRequiredSystemLibraries.cmake to work with win64
+ 
  Changes in CMake 2.6.1 RC 15
  - Fix bug 7426 FindJPEG module causes error when setting JPEG_LIBRARY to blank