From 13567bd1861ab36cfcdd4aa1ffdc935c8fcf6cf7 Mon Sep 17 00:00:00 2001 From: Patrick Storz Date: Sat, 4 Jan 2020 18:18:18 +0100 Subject: [PATCH] CPack/NSIS: Avoid "setup loading" screen by fixing template order NSIS packages files (including those required by the installer itslef) in the order in which they're mentioned in the .nsi file. If solid compression is used, the installer might need to extract large parts of the archive to be able to even start the setup program ("Please wait while setup is loading..."). Avoid this by moving component installation towards the end of the template file. --- Modules/Internal/CPack/NSIS.template.in | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Modules/Internal/CPack/NSIS.template.in b/Modules/Internal/CPack/NSIS.template.in index 23bb001838..7d6a755092 100644 --- a/Modules/Internal/CPack/NSIS.template.in +++ b/Modules/Internal/CPack/NSIS.template.in @@ -523,14 +523,6 @@ Function DownloadFile 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@ @@ -621,7 +613,6 @@ FunctionEnd !insertmacro MUI_LANGUAGE "Ukrainian" !insertmacro MUI_LANGUAGE "Welsh" - ;-------------------------------- ;Reserve Files @@ -632,6 +623,14 @@ FunctionEnd ReserveFile "NSIS.InstallOptions.ini" !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +;-------------------------------- +; Installation types +@CPACK_NSIS_INSTALLATION_TYPES@ + +;-------------------------------- +; Component sections +@CPACK_NSIS_COMPONENT_SECTIONS@ + ;-------------------------------- ;Installer Sections