diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index 55e8a8cd95..fd8aa68b77 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -22,6 +22,8 @@
@@ -29,6 +31,8 @@
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
new file mode 100644
index 0000000000..fe125cfdfe
--- /dev/null
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -0,0 +1,70 @@
+
+
+
+
+ [WixBundleName] Setup
+ [WixBundleName]
+ Version [WixBundleVersion]
+ Are you sure you want to cancel?
+
+
+
+
+Setup will install [WixBundleName] on your computer. Click install to continue, options to set the install directory or Close to exit.
+
+ [WixBundleName] <a href="#">license terms</a>.
+ I &agree to the license terms and conditions
+ &Options
+ &Install
+ &Close
+
+
+
+ Install location:
+ &Browse
+ &OK
+ &Cancel
+
+
+
+ &Repair
+ &Uninstall
+ &Close
+
+
+
+ Processing:
+ Initializing...
+ &Cancel
+
+
+
+
+
+
+ &Launch
+ &Close
+
+
+
+
+
+
+
+One or more issues caused the setup to fail. Please fix the issues and then retry setup. For more information see the <a href="#">log file</a>.
+
+ &Close
+
+
+
+
+/install | /repair | /uninstall | /layout [directory] - installs, repairs, uninstalls or creates a complete local copy of the bundle in directory. Install is the default.
+
+/passive | /quiet - displays minimal UI with no prompts or displays no UI and no prompts. By default UI and all prompts are displayed.
+
+/log log.txt - logs to a specific file. By default a log file is created in %TEMP%.
+
+ &Close
+
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
new file mode 100644
index 0000000000..61b338cc13
--- /dev/null
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -0,0 +1,87 @@
+
+
+
+ #(loc.WindowTitle)
+
+ Segoe UI
+ Segoe UI
+ Segoe UI
+ Segoe UI
+
+
+
+ #(loc.Title)
+
+
+
+ @WIX_THEME_INSTALL_LICENSE_ELEMENT@
+
+ #(loc.InstallAcceptCheckbox)
+
+
+
+
+
+
+
+ #(loc.OptionsHeader)
+
+ #(loc.OptionsLocationLabel)
+
+
+
+
+
+
+
+
+
+ #(loc.ModifyHeader)
+
+
+
+
+
+
+
+
+ #(loc.ProgressHeader)
+
+ #(loc.ProgressLabel)
+ #(loc.OverallProgressPackageText)
+
+
+
+
+
+
+
+ #(loc.SuccessHeader)
+ #(loc.SuccessInstallHeader)
+ #(loc.SuccessRepairHeader)
+ #(loc.SuccessUninstallHeader)
+
+
+
+
+
+
+
+ #(loc.FailureHeader)
+ #(loc.FailureInstallHeader)
+ #(loc.FailureUninstallHeader)
+ #(loc.FailureRepairHeader)
+
+ #(loc.FailureHyperlinkLogText)
+
+
+
+
+
+
+
+ #(loc.HelpHeader)
+ #(loc.HelpText)
+
+
+
diff --git a/cmake/Platform/Windows/PackagingPostBuild.cmake b/cmake/Platform/Windows/PackagingPostBuild.cmake
index 89b3efb44b..1dcbedcba7 100644
--- a/cmake/Platform/Windows/PackagingPostBuild.cmake
+++ b/cmake/Platform/Windows/PackagingPostBuild.cmake
@@ -25,6 +25,7 @@ set(_ext_flags
)
set(_addtional_defines
+ -dCPACK_BOOTSTRAP_THEME_FILE=${CPACK_BINARY_DIR}/BootstrapperTheme
-dCPACK_BOOTSTRAP_UPGRADE_GUID=${CPACK_WIX_BOOTSTRAP_UPGRADE_GUID}
-dCPACK_DOWNLOAD_SITE=${CPACK_DOWNLOAD_SITE}
-dCPACK_LOCAL_INSTALLER_DIR=${_cpack_wix_out_dir}
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 2fd281ad51..aec0edeee2 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -92,6 +92,28 @@ set(CPACK_WIX_EXTENSIONS
set(_embed_artifacts "yes")
if(LY_INSTALLER_DOWNLOAD_URL)
+
+ if(LY_INSTALLER_LICENSE_URL)
+ set(WIX_THEME_INSTALL_LICENSE_ELEMENT
+ "#(loc.InstallLicenseLinkText)"
+ )
+ else()
+ set(WIX_THEME_INSTALL_LICENSE_ELEMENT
+ ""
+ )
+ endif()
+
+ configure_file(
+ "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.xml.in"
+ "${CPACK_BINARY_DIR}/BootstrapperTheme.xml"
+ @ONLY
+ )
+ configure_file(
+ "${CPACK_SOURCE_DIR}/Platform/Windows/Packaging/BootstrapperTheme.wxl.in"
+ "${CPACK_BINARY_DIR}/BootstrapperTheme.wxl"
+ @ONLY
+ )
+
set(_embed_artifacts "no")
# the bootstrapper will at the very least need a different upgrade guid
diff --git a/cmake/Platform/Windows/platform_windows_files.cmake b/cmake/Platform/Windows/platform_windows_files.cmake
index 3ce53fbcea..b3cdc8a4ff 100644
--- a/cmake/Platform/Windows/platform_windows_files.cmake
+++ b/cmake/Platform/Windows/platform_windows_files.cmake
@@ -26,6 +26,8 @@ set(FILES
Packaging_windows.cmake
PackagingPostBuild.cmake
Packaging/Bootstrapper.wxs
+ Packaging/BootstrapperTheme.wxl.in
+ Packaging/BootstrapperTheme.xml.in
Packaging/Shortcuts.wxs
Packaging/Template.wxs.in
)