[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.25 1.144.2.26 ChangeLog.manual 1.1.10.24 1.1.10.25

[cmake-commits at cmake.org]

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

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.25
retrieving revision 1.144.2.26
diff -C 2 -d -r1.144.2.25 -r1.144.2.26
*** CMakeLists.txt	13 Jun 2008 12:55:14 -0000	1.144.2.25
--- CMakeLists.txt	25 Jun 2008 13:51:31 -0000	1.144.2.26
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 4)
  # 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 5)
  # 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.24
retrieving revision 1.1.10.25
diff -C 2 -d -r1.1.10.24 -r1.1.10.25
*** ChangeLog.manual	13 Jun 2008 12:55:14 -0000	1.1.10.24
--- ChangeLog.manual	25 Jun 2008 13:51:31 -0000	1.1.10.25
***************
*** 1,2 ****
--- 1,18 ----
+ Changes in CMake 2.6.1 RC 5
+ - Add support for component based packages in cpack.
+ - Fix FindBLAS.cmake if no fortran compiler is found
+ - Fix FindFLTK.cmake to pass new module test
+ - Fix FindKDE3.cmake to not add flags if kde3 is not found
+ - Fix FindMatlab.cmake, FindOpenSSL.cmake, FindQt3.cmake,
+   FindSWIG.cmake, to only error if it is required
+ - Fix FindwxWidgets.cmake to work on msys
+ - Add a beta OSX bundle generator for CPack
+ - Fix bug in cmake --build-and-test where cmake output was lost
+ - Fix ctest handling of CDash dart measurement support
+ - Add a group view to cmake-gui
+ - Fix nmake/make with visual studio compiler to handle long link lines
+ - Fix FLTK_WRAP_UI to better notice when mistakes are made with the target name
+ - Fix spelling error EnableFiberSafeOptimizations
+ - 
  Changes in CMake 2.6.1 RC 4
  - Change to find_*, a new HINTS keyword was added to avoid the