[Cmake-commits] [cmake-commits] hoffman committed CMakeCPackOptions.cmake.in 1.8.2.1 1.8.2.2 CMakeLists.txt 1.144.2.58 1.144.2.59 ChangeLog.manual 1.1.10.56 1.1.10.57

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeCPackOptions.cmake.in CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in a few more changes for installer on windows and cmake-gui


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.58
retrieving revision 1.144.2.59
diff -C 2 -d -r1.144.2.58 -r1.144.2.59
*** CMakeLists.txt	10 Feb 2009 22:28:07 -0000	1.144.2.58
--- CMakeLists.txt	16 Feb 2009 19:06:32 -0000	1.144.2.59
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 3)
! SET(CMake_VERSION_RC 13)
  # 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 3)
! SET(CMake_VERSION_RC 14)
  # 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.2.1
retrieving revision 1.8.2.2
diff -C 2 -d -r1.8.2.1 -r1.8.2.2
*** CMakeCPackOptions.cmake.in	13 Jul 2008 21:55:23 -0000	1.8.2.1
--- CMakeCPackOptions.cmake.in	16 Feb 2009 19:06:32 -0000	1.8.2.2
***************
*** 12,16 ****
    # tell cpack to create links to the doc files
    SET(CPACK_NSIS_MENU_LINKS
!     "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake.html" "CMake Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-properties.html"
--- 12,16 ----
    # tell cpack to create links to the doc files
    SET(CPACK_NSIS_MENU_LINKS
!     "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-gui.html" "cmake-gui Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake.html" "CMake Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-properties.html"
***************
*** 19,27 ****
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cpack.html" "CPack Help"
      "http://www.cmake.org" "CMake Web Site"
      )
    # tell cpack the executables you want in the start menu as links
!   SET(CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMake" )
    # tell cpack to create a desktop link to CMakeSetup
    SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup")
--- 19,28 ----
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
+     "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
      "doc/cmake- at CMake_VERSION_MAJOR@. at CMake_VERSION_MINOR@/cpack.html" "CPack Help"
      "http://www.cmake.org" "CMake Web Site"
      )
    # tell cpack the executables you want in the start menu as links
!   SET(CPACK_PACKAGE_EXECUTABLES "CMakeSetup" "CMakeSetup(deprecated)" )
    # tell cpack to create a desktop link to CMakeSetup
    SET(CPACK_CREATE_DESKTOP_LINKS "CMakeSetup")

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.56
retrieving revision 1.1.10.57
diff -C 2 -d -r1.1.10.56 -r1.1.10.57
*** ChangeLog.manual	10 Feb 2009 22:28:07 -0000	1.1.10.56
--- ChangeLog.manual	16 Feb 2009 19:06:32 -0000	1.1.10.57
***************
*** 1,2 ****
--- 1,5 ----
+ Changes in CMake 2.6.3 RC 14
+ - Take cmake-gui out of beta for windows installer
+ 
  Changes in CMake 2.6.3 RC 13
  - Fix cmake can not find cmake when run on windows from PATH