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

CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)

This commit is contained in:
David Golub 2012-05-09 14:56:36 -04:00 committed by David Cole
parent 7a8da5fce1
commit 51da766a6d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/NSIS.template.in
View File

@ -37,6 +37,9 @@
;Set compression ;Set compression
SetCompressor @CPACK_NSIS_COMPRESSOR@ SetCompressor @CPACK_NSIS_COMPRESSOR@
;Require administrator access
RequestExecutionLevel admin
@CPACK_NSIS_DEFINES@ @CPACK_NSIS_DEFINES@
!include Sections.nsh !include Sections.nsh
@ -119,7 +122,7 @@ Var AR_RegFlags
"exit_${SecName}:" "exit_${SecName}:"
!macroend !macroend
!macro RemoveSection SecName !macro RemoveSection_CPack SecName
; This macro is used to call section's Remove_... macro ; This macro is used to call section's Remove_... macro
;from the uninstaller. ;from the uninstaller.
;Input: section index constant name specified in Section command. ;Input: section index constant name specified in Section command.
@ -841,7 +844,7 @@ Section "Uninstall"
DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
; Removes all optional components ; Removes all optional components
!insertmacro SectionList "RemoveSection" !insertmacro SectionList "RemoveSection_CPack"
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP