diff options
| author | David Golub <golubdr@gmail.com> | 2012-05-09 18:56:36 (GMT) |
|---|---|---|
| committer | David Cole <david.cole@kitware.com> | 2012-11-20 00:53:29 (GMT) |
| commit | 51da766a6d85397f9244f5ec426091848d9318ff (patch) | |
| tree | 4a7a714cc438b8ab6ef037e9d8a37c123a85c19d /Modules | |
| parent | 7a8da5fce1d6974a087c4a20b585ca0d900afbbb (diff) | |
| download | CMake-51da766a6d85397f9244f5ec426091848d9318ff.zip CMake-51da766a6d85397f9244f5ec426091848d9318ff.tar.gz CMake-51da766a6d85397f9244f5ec426091848d9318ff.tar.bz2 | |
CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202)
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/NSIS.template.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index ffc425e..59a444b 100644 --- a/Modules/NSIS.template.in +++ b/Modules/NSIS.template.in @@ -37,6 +37,9 @@ ;Set compression SetCompressor @CPACK_NSIS_COMPRESSOR@ + ;Require administrator access + RequestExecutionLevel admin + @CPACK_NSIS_DEFINES@ !include Sections.nsh @@ -119,7 +122,7 @@ Var AR_RegFlags "exit_${SecName}:" !macroend -!macro RemoveSection SecName +!macro RemoveSection_CPack SecName ; This macro is used to call section's Remove_... macro ;from the uninstaller. ;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@" ; Removes all optional components - !insertmacro SectionList "RemoveSection" + !insertmacro SectionList "RemoveSection_CPack" !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP |