From fc365df5de6e61b9e5e357cc609bece034b45c4e Mon Sep 17 00:00:00 2001
From: Michael Schuster <michael@schuster.ms>
Date: Sat, 5 Sep 2020 04:39:05 +0200
Subject: [PATCH] Windows MSI: Let CMake install Shell Extensions WiX fragment
 to "msi/"

Signed-off-by: Michael Schuster <michael@schuster.ms>
---
 shell_integration/windows/CMakeLists.txt     | 9 ++++++++-
 shell_integration/windows/WinShellExt.wxs.in | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/shell_integration/windows/CMakeLists.txt b/shell_integration/windows/CMakeLists.txt
index d75d2574d..e57f552ad 100644
--- a/shell_integration/windows/CMakeLists.txt
+++ b/shell_integration/windows/CMakeLists.txt
@@ -7,9 +7,16 @@ include_directories(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 configure_file(WinShellExtConstants.h.in ${CMAKE_CURRENT_BINARY_DIR}/WinShellExtConstants.h)
-configure_file(WinShellExt.wxs.in ${CMAKE_CURRENT_BINARY_DIR}/WinShellExt.wxs)
 
 add_subdirectory(NCContextMenu)
 add_subdirectory(NCOverlays)
 add_subdirectory(NCUtil)
 
+if(BUILD_WIN_MSI)
+    configure_file(WinShellExt.wxs.in ${CMAKE_CURRENT_BINARY_DIR}/WinShellExt.wxs)
+
+    install(FILES
+        ${CMAKE_CURRENT_BINARY_DIR}/WinShellExt.wxs
+        DESTINATION msi/
+    )
+endif()
diff --git a/shell_integration/windows/WinShellExt.wxs.in b/shell_integration/windows/WinShellExt.wxs.in
index 6ac42dca4..138258fb8 100644
--- a/shell_integration/windows/WinShellExt.wxs.in
+++ b/shell_integration/windows/WinShellExt.wxs.in
@@ -14,7 +14,7 @@
  * for more details.
  *
 -->
-<?include $(var.ProjectPath)Platform.wxi?>
+<?include $(sys.CURRENTDIR)Platform.wxi?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Fragment>
-- 
2.30.2