diff options
| author | Brad King <brad.king@kitware.com> | 2012-11-27 18:34:13 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2012-11-27 18:34:13 (GMT) |
| commit | f30393e28a49fe4d4e29d41cfc6b2a663ea691c0 (patch) | |
| tree | 019f63878f163e433df1fcf502cd5c58e4746c39 /Modules | |
| parent | 805c0f3f899413efe466eee06f46a1b4a3cb285a (diff) | |
| parent | 6ff730a4983d15f3e115a919eb18d866f8c65507 (diff) | |
| download | CMake-f30393e28a49fe4d4e29d41cfc6b2a663ea691c0.zip CMake-f30393e28a49fe4d4e29d41cfc6b2a663ea691c0.tar.gz CMake-f30393e28a49fe4d4e29d41cfc6b2a663ea691c0.tar.bz2 | |
Merge topic 'cpack-nsis64-patches'
6ff730a CPack/NSIS: Add support for 64-bit NSIS (#13203)
51da766 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 |