summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorSadie Powell <sadie@witchery.services>2021-08-28 19:53:17 +0100
committerSadie Powell <sadie@witchery.services>2021-08-28 19:53:17 +0100
commite5075d2dc2c1437ac8f24d13c274089a5f76ac0a (patch)
tree9f74a530e58502125953118633585847dac78dfd /cmake
parente7e8447fa39ced57743eab51e8e2835ddddd7001 (diff)
parent98fdce2e1de274e077a56a4dc10ba8c96d5cab86 (diff)
Merge branch '2.0' into 2.1
Diffstat (limited to 'cmake')
-rw-r--r--cmake/NSIS.template.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in
index d2df95e74..1b0e06c9b 100644
--- a/cmake/NSIS.template.in
+++ b/cmake/NSIS.template.in
@@ -118,7 +118,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.
@@ -731,7 +731,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