diff options
| author | David Cole <david.cole@kitware.com> | 2009-04-07 19:31:51 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2009-04-07 19:31:51 (GMT) |
| commit | 698cf0c8868e9856a1f6c3f5b333fbd4e2088f47 (patch) | |
| tree | 7ddb0d67a67f34bdafc697ebb9e82e4f235992c2 /Modules | |
| parent | f6828c391deb8274de43270fec640d02b15778fd (diff) | |
| download | CMake-698cf0c8868e9856a1f6c3f5b333fbd4e2088f47.zip CMake-698cf0c8868e9856a1f6c3f5b333fbd4e2088f47.tar.gz CMake-698cf0c8868e9856a1f6c3f5b333fbd4e2088f47.tar.bz2 | |
BUG: Fix issue #8682. Use CPACK_NSIS_DISPLAY_NAME in appropriate places rather than CPACK_PACKAGE_INSTALL_DIRECTORY. Clean separation of these two variables (which have the same value by default) allows an easy workaround for issue #7881, too.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/NSIS.template.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index 19017c8..983ff15 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -25,22 +25,22 @@ !include "MUI.nsh" ;Default installation folder - InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" + InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" ;-------------------------------- ;General ;Name and file - Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@" + Name "@CPACK_NSIS_DISPLAY_NAME@" OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@" ;Set compression SetCompressor @CPACK_NSIS_COMPRESSOR@ - + @CPACK_NSIS_DEFINES@ - + !include Sections.nsh - + ;--- Component support macros: --- ; The code for the add/remove functionality is from: ; http://nsis.sourceforge.net/Add/Remove_Functionality @@ -701,7 +701,7 @@ SectionEnd ;-------------------------------- ; Create custom pages Function InstallOptionsPage - !insertmacro MUI_HEADER_TEXT "Install Options" "Chose options for installing @CPACK_PACKAGE_INSTALL_DIRECTORY@" + !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_DISPLAY_NAME@" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini" FunctionEnd |