diff options
| author | Trung Tran <trung.tran@ettus.com> | 2018-03-30 10:31:25 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2018-03-30 11:04:01 -0700 |
| commit | 4ae40a8cb7ec592202faa87b3170d7cd1a3fb90a (patch) | |
| tree | 2d74bbbb6503648c3f9f1617db73cfa11eea4db0 | |
| parent | 4ca2fd45034df255d752712a78bab917f2affc6d (diff) | |
| download | uhd-4ae40a8cb7ec592202faa87b3170d7cd1a3fb90a.tar.gz uhd-4ae40a8cb7ec592202faa87b3170d7cd1a3fb90a.tar.bz2 uhd-4ae40a8cb7ec592202faa87b3170d7cd1a3fb90a.zip | |
cmake: update NSIS template
RemoveSection is deprecate because NSIS has some macro that is the same
name. The upstream NSISTemplate of CMake already update since 2012 but
we did not. This commit will enable our our Packaging for windows run
against latest NSIS app.
| -rw-r--r-- | host/cmake/Modules/NSIS.template.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/host/cmake/Modules/NSIS.template.in b/host/cmake/Modules/NSIS.template.in index 6e3c4af20..d466a6d06 100644 --- a/host/cmake/Modules/NSIS.template.in +++ b/host/cmake/Modules/NSIS.template.in @@ -119,7 +119,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. @@ -845,7 +845,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 |