[Cmake-commits] [cmake-commits] david.cole committed CMakeCPackOptions.cmake.in 1.12 1.13

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Jul 20 12:08:36 EDT 2009


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

Modified Files:
	CMakeCPackOptions.cmake.in 
Log Message:
BUG: Add CPACK_NSIS_PACKAGE_NAME to the list of CPack variables that CMake overrides. We use the same value as the CPack-provided default, but do it here such that configuring with an older CMake will still give us this new variable. Necessary so that the CMake release process works with the new variable: CMake is configured with a previous CMake, but packaged with the freshly built CPack. (This fix is necessary because the fix for issue #8682 caused the side effect of having an empty CPACK_NSIS_PACKAGE_NAME for the CMake nightly package.)


Index: CMakeCPackOptions.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeCPackOptions.cmake.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** CMakeCPackOptions.cmake.in	26 Jun 2009 14:18:09 -0000	1.12
--- CMakeCPackOptions.cmake.in	20 Jul 2009 16:08:34 -0000	1.13
***************
*** 28,36 ****
    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")
    SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@)
    SET(CPACK_NSIS_MODIFY_PATH ON)
  endif(CPACK_GENERATOR MATCHES "NSIS")
  # include the cpack options for qt dialog if they exisit
  # they might not if qt was not enabled for the build
--- 28,38 ----
    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_PACKAGE_NAME "CMake @CMake_VERSION_MAJOR at .@CMake_VERSION_MINOR@")
!   SET(CPACK_NSIS_HELP_LINK "http://www.cmake.org")
!   SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.kitware.com")
    SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@)
    SET(CPACK_NSIS_MODIFY_PATH ON)
  endif(CPACK_GENERATOR MATCHES "NSIS")
+ 
  # include the cpack options for qt dialog if they exisit
  # they might not if qt was not enabled for the build



More information about the Cmake-commits mailing list