Skip to content

Commit 798a689

Browse files
pimbormanbluca
authored andcommitted
rename removesection macro to avoid duplicate conflict with nsis3
1 parent c2f7f8a commit 798a689

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

builds/cmake/NSIS.template32.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Var AR_RegFlags
120120
"exit_${SecName}:"
121121
!macroend
122122

123-
!macro RemoveSection SecName
123+
!macro RemoveSection_CPack SecName
124124
; This macro is used to call section's Remove_... macro
125125
;from the uninstaller.
126126
;Input: section index constant name specified in Section command.
@@ -843,7 +843,7 @@ Section "Uninstall"
843843
DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
844844

845845
; Removes all optional components
846-
!insertmacro SectionList "RemoveSection"
846+
!insertmacro SectionList "RemoveSection_CPack"
847847

848848
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
849849

builds/cmake/NSIS.template64.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ Var AR_RegFlags
120120
"exit_${SecName}:"
121121
!macroend
122122

123-
!macro RemoveSection SecName
123+
!macro RemoveSection_CPack SecName
124124
; This macro is used to call section's Remove_... macro
125125
;from the uninstaller.
126126
;Input: section index constant name specified in Section command.
@@ -846,7 +846,7 @@ Section "Uninstall"
846846
DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
847847

848848
; Removes all optional components
849-
!insertmacro SectionList "RemoveSection"
849+
!insertmacro SectionList "RemoveSection_CPack"
850850

851851
!insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
852852

0 commit comments

Comments
 (0)