From d8d1c1d18ccfe8fd40a732f5d6e33468482a4ae9 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 9 Aug 2021 17:17:25 -0400 Subject: [PATCH] cmake: update NSIS template for NSIS 3 Newer cmake versions require NSIS 3, which already defines a RemoveSection macro causing cpack to fail --- cmake/NSIS.template.in | 4 ++-- 1 file 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