diff options
| author | David Cole <david.cole@kitware.com> | 2009-07-20 16:08:34 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-07-20 16:08:34 (GMT) |
| commit | 9f629f7a16aa090266083d302f2ae9efba95bee7 (patch) | |
| tree | 873794298304d39cfa55bcda041a867d4979fa65 /CMakeCPackOptions.cmake.in | |
| parent | 0902d2918e1da15832f1d141d534734cc5f62d84 (diff) | |
| download | CMake-9f629f7a16aa090266083d302f2ae9efba95bee7.zip CMake-9f629f7a16aa090266083d302f2ae9efba95bee7.tar.gz CMake-9f629f7a16aa090266083d302f2ae9efba95bee7.tar.bz2 | |
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.)
Diffstat (limited to 'CMakeCPackOptions.cmake.in')
| -rw-r--r-- | CMakeCPackOptions.cmake.in | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeCPackOptions.cmake.in b/CMakeCPackOptions.cmake.in index 8fe6154..a3e2504 100644 --- a/CMakeCPackOptions.cmake.in +++ b/CMakeCPackOptions.cmake.in @@ -27,11 +27,13 @@ if(CPACK_GENERATOR MATCHES "NSIS") # tell cpack to create a desktop link to 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") + SET(CPACK_NSIS_PACKAGE_NAME "CMake @CMake_VERSION_MAJOR@.@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 INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL) |