diff options
| author | David Cole <david.cole@kitware.com> | 2009-07-16 15:48:30 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-07-16 15:48:30 (GMT) |
| commit | 85733c17c5665df98426ab9642b2156eca8316c7 (patch) | |
| tree | 16018829636b688b2a2b5259fe6ae4c843deb6c9 | |
| parent | 611c120ad6d3f768d5a63f5a1d15f87ef92f8600 (diff) | |
| download | CMake-85733c17c5665df98426ab9642b2156eca8316c7.zip CMake-85733c17c5665df98426ab9642b2156eca8316c7.tar.gz CMake-85733c17c5665df98426ab9642b2156eca8316c7.tar.bz2 | |
BUG: Re-fix issue #8682. Use new variable CPACK_NSIS_PACKAGE_NAME in appropriate places rather than CPACK_NSIS_DISPLAY_NAME. CPACK_NSIS_DISPLAY_NAME is the Add/Remove control panel's description string for the installed package. Using it as the "Name" of the NSIS installer package made the CMake installer itself use really long strings in the installer GUI. This fix still allows for the original intent of the first fix for #8682 -- the ability to separate the installer name from the default install directory, but it uses a new/different variable to achieve the separation.
| -rw-r--r-- | Modules/CPack.cmake | 6 | ||||
| -rw-r--r-- | Modules/NSIS.template.in | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index cd13cbf..0f0d880 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -136,7 +136,10 @@ # whether the program directory should be added to the system PATH # variable. # -# CPACK_NSIS_DISPLAY_NAME - The title displayed at the top of the +# CPACK_NSIS_DISPLAY_NAME - The display name string that appears in +# the Windows Add/Remove Program control panel +# +# CPACK_NSIS_PACKAGE_NAME - The title displayed at the top of the # installer. # # CPACK_NSIS_INSTALLED_ICON_NAME - A path to the executable that @@ -779,6 +782,7 @@ cpack_set_if_not_set(CPACK_CMAKE_GENERATOR "${CMAKE_GENERATOR}") cpack_set_if_not_set(CPACK_TOPLEVEL_TAG "${CPACK_SYSTEM_NAME}") cpack_set_if_not_set(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") +cpack_set_if_not_set(CPACK_NSIS_PACKAGE_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY}") cpack_set_if_not_set(CPACK_OUTPUT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackConfig.cmake") diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index 983ff15..8b9608e 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -31,7 +31,7 @@ ;General ;Name and file - Name "@CPACK_NSIS_DISPLAY_NAME@" + Name "@CPACK_NSIS_PACKAGE_NAME@" OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@" ;Set compression @@ -701,7 +701,7 @@ SectionEnd ;-------------------------------- ; Create custom pages Function InstallOptionsPage - !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_DISPLAY_NAME@" + !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini" FunctionEnd |