Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Schuster <michael@schuster.ms>2020-09-05 05:39:05 +0300
committerMichael Schuster <michael@schuster.ms>2020-09-21 17:40:19 +0300
commitfc365df5de6e61b9e5e357cc609bece034b45c4e (patch)
tree44562ff3851f780c108c1d5599d70e733a578666 /shell_integration
parentfad9b2c96910d04d8756e7ef47161830b032e4a2 (diff)
Windows MSI: Let CMake install Shell Extensions WiX fragment to "msi/"
Signed-off-by: Michael Schuster <michael@schuster.ms>
Diffstat (limited to 'shell_integration')
-rw-r--r--shell_integration/windows/CMakeLists.txt9
-rw-r--r--shell_integration/windows/WinShellExt.wxs.in2
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>