From 09935aaf6cb731fdf3840f8a3ad988ba053921ef Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Fri, 10 Feb 2017 16:08:56 +0000
Subject: [PATCH] Use configure_files macro for WiX

---
 CMakeLists.txt          | 13 ++-----------
 dist/wix/Include.wxi.in |  8 ++++----
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9e3dd5e1..968c4e81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -364,6 +364,8 @@ endmacro (configure_files)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
 	configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle ${CMAKE_BINARY_DIR}/bundle)
+elseif(WIN32 AND NOT UNIX)
+	configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
 endif()
 
 if (CONF_DOXYGEN)
@@ -375,17 +377,6 @@ if (CONF_DOXYGEN)
 
 endif()
 
-if (WIN32)
-	configure_file (dist/wix/Include.wxi.in
-					"${CMAKE_BINARY_DIR}/dist/wix/Include.wxi" NEWLINE_STYLE WIN32)
-
-	configure_file (dist/wix/Product.wxs
-					"${CMAKE_BINARY_DIR}/dist/wix/Product.wxs" COPYONLY)
-
-	configure_file (dist/wix/Synergy.wixproj
-					"${CMAKE_BINARY_DIR}/dist/wix/Synergy.wixproj" COPYONLY)
-endif()
-
 option(SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
 
 add_subdirectory(src)
diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index 6641bc0b..47f17db3 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -4,9 +4,9 @@
     <?define Version="1.9.0" ?> <!-- TODO: Configure this externally //--> 
     <?define QtVersion="5.8" ?> <!-- TODO: Configure this externally //--> 
     <?define Author="Symless Ltd" ?>
-    <?define BinPath="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$(var.Configuration)" ?>
-    <?define ResPath="${CMAKE_CURRENT_SOURCE_DIR}/res" ?>
-    <?define ExtPath="${CMAKE_CURRENT_SOURCE_DIR}/ext" ?>
+    <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
+    <?define ResPath="@CMAKE_CURRENT_SOURCE_DIR@/res" ?>
+    <?define ExtPath="@CMAKE_CURRENT_SOURCE_DIR@/ext" ?>
     <?if $(var.Platform) = "x64" ?>
         <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
         <?define PlatformSimpleName="64-bit" ?>
@@ -26,4 +26,4 @@
         <?define DebugCRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_DebugCRT_$(var.Platform).msm" ?>
     <?endif ?>
     <?define CRT="$(env.CommonProgramFiles)\Merge Modules\Microsoft_VC140_CRT_$(var.Platform).msm" ?>
-</Include>
\ No newline at end of file
+</Include>