diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-10 18:53:24 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-10 18:53:30 (GMT) |
| commit | cf79034450f8ec5eb766e318075bbb8a64381326 (patch) | |
| tree | 35b6ff80b3bdaa97804f437f97e78042c87fa7cb /Modules | |
| parent | 78f9c9dd0e497641e1383a7da2d6cac071cfde46 (diff) | |
| parent | 9d2816544ea811e2d1793c5a92c14697aa8e43c1 (diff) | |
| download | CMake-cf79034450f8ec5eb766e318075bbb8a64381326.zip CMake-cf79034450f8ec5eb766e318075bbb8a64381326.tar.gz CMake-cf79034450f8ec5eb766e318075bbb8a64381326.tar.bz2 | |
Merge topic 'cpack_nsis_avoid_delay'
9d2816544e CPack/NSIS: Also preload the "UserInfo.dll" plugin
13567bd186 CPack/NSIS: Avoid "setup loading" screen by fixing template order
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4171
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/Internal/CPack/NSIS.template.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in index 23bb0018..660bfa3 100644 --- a/Modules/Internal/CPack/NSIS.template.in +++ b/Modules/Internal/CPack/NSIS.template.in @@ -524,14 +524,6 @@ FunctionEnd !endif ;-------------------------------- -; Installation types -@CPACK_NSIS_INSTALLATION_TYPES@ - -;-------------------------------- -; Component sections -@CPACK_NSIS_COMPONENT_SECTIONS@ - -;-------------------------------- ; Define some macro setting for the gui @CPACK_NSIS_INSTALLER_MUI_ICON_CODE@ @CPACK_NSIS_INSTALLER_ICON_CODE@ @@ -621,7 +613,6 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Ukrainian" !insertmacro MUI_LANGUAGE "Welsh" - ;-------------------------------- ;Reserve Files @@ -632,6 +623,17 @@ FunctionEnd ReserveFile "NSIS.InstallOptions.ini" !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS + ; for UserInfo::GetName and UserInfo::GetAccountType + ReserveFile /plugin 'UserInfo.dll' + +;-------------------------------- +; Installation types +@CPACK_NSIS_INSTALLATION_TYPES@ + +;-------------------------------- +; Component sections +@CPACK_NSIS_COMPONENT_SECTIONS@ + ;-------------------------------- ;Installer Sections |