[Cmake-commits] [cmake-commits] hoffman committed CMakeCPackOptions.cmake.in 1.8 1.8.2.1 CMakeLists.txt 1.144.2.27 1.144.2.28 ChangeLog.manual 1.1.10.26 1.1.10.27

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeCPackOptions.cmake.in CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: Merge from head create RC7


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.27
retrieving revision 1.144.2.28
diff -C 2 -d -r1.144.2.27 -r1.144.2.28
*** CMakeLists.txt	30 Jun 2008 20:10:26 -0000	1.144.2.27
--- CMakeLists.txt	13 Jul 2008 21:55:23 -0000	1.144.2.28
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 1)
! SET(CMake_VERSION_RC 6)
  # 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 7)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable

Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C 2 -d -r1.8 -r1.8.2.1
*** CMakeCPackOptions.cmake.in	13 Mar 2008 01:54:27 -0000	1.8
--- CMakeCPackOptions.cmake.in	13 Jul 2008 21:55:23 -0000	1.8.2.1
***************
*** 27,31 ****
    SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup")
    SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\CMakeSetup.exe")
!   SET(CPACK_NSIS_DISPLAY_NAME "CMake ${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR} a cross-platform, open-source build system")
    SET(CPACK_NSIS_HELP_LINK "http:\\\\www.cmake.org")
    SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.kitware.com")
--- 27,31 ----
    SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup")
    SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\CMakeSetup.exe")
!   SET(CPACK_NSIS_DISPLAY_NAME "CMake @CMake_VERSION_MAJOR at .@CMake_VERSION_MINOR@ a cross-platform, open-source build system")
    SET(CPACK_NSIS_HELP_LINK "http:\\\\www.cmake.org")
    SET(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\www.kitware.com")

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.26
retrieving revision 1.1.10.27
diff -C 2 -d -r1.1.10.26 -r1.1.10.27
*** ChangeLog.manual	30 Jun 2008 20:10:26 -0000	1.1.10.26
--- ChangeLog.manual	13 Jul 2008 21:55:23 -0000	1.1.10.27
***************
*** 1,2 ****
--- 1,17 ----
+ Changes in CMake 2.6.1 RC 7
+ - More fixes for CPack components functionality
+ - Fixes for Xcode generater #7277 #7044, do not compile foo.txt.
+   Rebuild application bundles when a library changes. Set the project
+   location for Xcode 3.1
+ - Do not automatically add EXECUTABLE_OUTPUT_PATH to cache.
+ - New tree view in cmake-gui
+ - FindBoost.cmake, find boost as installed by the BoostPro/Boost Consulting 
+   installers on Windows. And cleanup FindBoost module, fixing several small 
+   bugs and providing better diagnostic information when things go wrong.
+ - Fix FindwxWidgets.cmake to find richtext library
+ - Fix FindQt4.cmake with empty qconfig.pri files.  Fixes #7287.
+ - Fix add/remove program version string again...
+ - Fix column width in cmake-gui
+ 
  Changes in CMake 2.6.1 RC 6
  - Fix DEFINITIONS property to be compatible with 2.4
***************
*** 18,22 ****
  - 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
--- 33,37 ----
  - 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