diff --git a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
index 6971e32ca2..079c20e212 100644
--- a/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
+++ b/cmake/Platform/Windows/Packaging/Bootstrapper.wxs
@@ -33,6 +33,7 @@
LogoFile="$(var.CPACK_WIX_PRODUCT_LOGO)"
ThemeFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).xml"
LocalizationFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).wxl"
+ ShowFilesInUse="yes"
ShowVersion="yes" />
@@ -44,6 +45,7 @@
LogoFile="$(var.CPACK_WIX_PRODUCT_LOGO)"
ThemeFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).xml"
LocalizationFile="$(var.CPACK_BOOTSTRAP_THEME_FILE).wxl"
+ ShowFilesInUse="yes"
ShowVersion="yes" />
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
index 6c5d16fd49..7d221913d5 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.wxl.in
@@ -39,6 +39,14 @@ Setup will install [WixBundleName] on your computer. Click install to continue,
Execution Progress
&Cancel
+
+
+ The following applications are using files that need to be modified:
+ Close the &applications
+ &Do not close applications, may cause unexpected side effects
+ &OK
+ &Cancel
+
diff --git a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
index 8d8416539e..b340d23467 100644
--- a/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
+++ b/cmake/Platform/Windows/Packaging/BootstrapperTheme.xml.in
@@ -70,6 +70,21 @@
+
+
+ #(loc.FilesInUseHeader)
+
+ #(loc.FilesInUseLabel)
+
+
+
+
+
+
+
+
+
+
#(loc.SuccessHeader)
diff --git a/cmake/Platform/Windows/Packaging_windows.cmake b/cmake/Platform/Windows/Packaging_windows.cmake
index 7c62a4984c..5bb9928b61 100644
--- a/cmake/Platform/Windows/Packaging_windows.cmake
+++ b/cmake/Platform/Windows/Packaging_windows.cmake
@@ -17,6 +17,10 @@ else()
return()
endif()
+# IMPORTANT: CPACK_WIX_ROOT is a built-in variable that is required to propagate the path supplied
+# via command line down to the cpack internals
+set(CPACK_WIX_ROOT ${LY_INSTALLER_WIX_ROOT})
+
set(CPACK_GENERATOR WIX)
set(_cmake_package_name "cmake-${CPACK_DESIRED_CMAKE_VERSION}-windows-x86_64")