kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

This commit is contained in:
David Cole 2009-04-07 15:31:51 -04:00
parent f6828c391d
commit 698cf0c886
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/NSIS.template.in
View File

@ -25,22 +25,22 @@
!include "MUI.nsh" !include "MUI.nsh"
;Default installation folder ;Default installation folder
InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
;-------------------------------- ;--------------------------------
;General ;General
;Name and file ;Name and file
Name "@CPACK_PACKAGE_INSTALL_DIRECTORY@" Name "@CPACK_NSIS_DISPLAY_NAME@"
OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@" OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
;Set compression ;Set compression
SetCompressor @CPACK_NSIS_COMPRESSOR@ SetCompressor @CPACK_NSIS_COMPRESSOR@
@CPACK_NSIS_DEFINES@ @CPACK_NSIS_DEFINES@
!include Sections.nsh !include Sections.nsh
;--- Component support macros: --- ;--- Component support macros: ---
; The code for the add/remove functionality is from: ; The code for the add/remove functionality is from:
; http://nsis.sourceforge.net/Add/Remove_Functionality ; http://nsis.sourceforge.net/Add/Remove_Functionality
@ -701,7 +701,7 @@ SectionEnd
;-------------------------------- ;--------------------------------
; Create custom pages ; Create custom pages
Function InstallOptionsPage 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" !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
FunctionEnd FunctionEnd