From 51da766a6d85397f9244f5ec426091848d9318ff Mon Sep 17 00:00:00 2001 From: David Golub Date: Wed, 9 May 2012 14:56:36 -0400 Subject: CPack/NSIS: Fix compatibility issues with prerelease NSIS (#13202) --- Modules/NSIS.template.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'Modules/NSIS.template.in') diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in index ffc425e67b..59a444bde4 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 -- cgit v1.2.1