[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.21 1.144.2.22 ChangeLog.manual 1.1.10.20 1.1.10.21

[cmake-commits at cmake.org]

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

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.21
retrieving revision 1.144.2.22
diff -C 2 -d -r1.144.2.21 -r1.144.2.22
*** CMakeLists.txt	5 May 2008 16:38:53 -0000	1.144.2.21
--- CMakeLists.txt	15 May 2008 19:39:49 -0000	1.144.2.22
***************
*** 354,359 ****
  SET(CMake_VERSION_MAJOR 2)
  SET(CMake_VERSION_MINOR 6)
! SET(CMake_VERSION_PATCH 0)
! #SET(CMake_VERSION_RC 1)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
--- 354,359 ----
  SET(CMake_VERSION_MAJOR 2)
  SET(CMake_VERSION_MINOR 6)
! SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 1)
  # 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.20
retrieving revision 1.1.10.21
diff -C 2 -d -r1.1.10.20 -r1.1.10.21
*** ChangeLog.manual	5 May 2008 17:38:18 -0000	1.1.10.20
--- ChangeLog.manual	15 May 2008 19:39:49 -0000	1.1.10.21
***************
*** 1,2 ****
--- 1,22 ----
+ Changes in CMake 2.6.1 RC 1
+ - Add a way to modify depend scanning with the property:
+   IMPLICIT_DEPENDS_INCLUDE_TRANSFORM
+ - Add a way for custom commands to skip depending on the rule.make file
+ - Fix ENABLE_LANGUAGE(ASM-ATT OPTIONAL)  to work
+ - Fix gcov in ctest in French or other non-English runs
+ - Fix help for ctest commands to be lower case
+ - Find QtCLucene on Qt/Mac binary
+ - Fix for build on ARM
+ - Fix for docbook to add newlines
+ - Fix -Wno-dev to not eat path to source tree
+ - Fix bug in NSIS CPack where CPACK_NSIS_MODIFY_PATH did modify the path
+ - Fix FindBoost version variable names to correct bug in Boost version 
+ - Fix Add/Remove program name for CMake install on windows
+ - Fix bug 0006988 coverage not reported on dashboards
+ - Fix bug 0006990 CMake crashes with bad input to set_source_files_properties
+ - Fix bug in FindCurses where you could not run cmake twice
+ - Fix 64 bit cmake creation of Xcode projects
+ - Add --help-policy to --help
+ 
  Changes in CMake 2.6.0
  - Fix links in generated documentation