From adf051a3542641f3a4c220a7f68473a39cd94c7e Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Wed, 8 Mar 2017 15:14:51 +0000
Subject: [PATCH] Make CMake configure Synergy version number in WiX

---
 CMakeLists.txt          | 4 +---
 dist/wix/Include.wxi.in | 2 +-
 dist/wix/Product.wxs    | 2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b71efb01..ccaf235e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -374,15 +374,13 @@ macro(configure_files srcDir destDir)
 endmacro (configure_files)
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+	set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
 	set (SYNERGY_BUNDLE_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dist/macos/bundle)
 	set (SYNERGY_BUNDLE_DIR ${CMAKE_BINARY_DIR}/bundle)
 	set (SYNERGY_BUNDLE_APP_DIR ${SYNERGY_BUNDLE_DIR}/Synergy.app)
 	set (SYNERGY_BUNDLE_BINARY_DIR ${SYNERGY_BUNDLE_APP_DIR}/Contents/MacOS)
 
 	configure_files (${SYNERGY_BUNDLE_SOURCE_DIR} ${SYNERGY_BUNDLE_DIR})
-
-	set (CMAKE_INSTALL_RPATH "@loader_path/../Libraries;@loader_path/../Frameworks")
-
 elseif(WIN32 AND NOT UNIX)
 	configure_files (${CMAKE_CURRENT_SOURCE_DIR}/dist/wix ${CMAKE_BINARY_DIR}/installer)
 endif()
diff --git a/dist/wix/Include.wxi.in b/dist/wix/Include.wxi.in
index 47f17db3..b8069a5f 100644
--- a/dist/wix/Include.wxi.in
+++ b/dist/wix/Include.wxi.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include>
     <?define Name="Synergy" ?>
-    <?define Version="1.9.0" ?> <!-- TODO: Configure this externally //--> 
+    <?define Version="@SYNERGY_VERSION@" ?>
     <?define QtVersion="5.8" ?> <!-- TODO: Configure this externally //--> 
     <?define Author="Symless Ltd" ?>
     <?define BinPath="@CMAKE_RUNTIME_OUTPUT_DIRECTORY@/$(var.Configuration)" ?>
diff --git a/dist/wix/Product.wxs b/dist/wix/Product.wxs
index c30f9a71..02f23315 100644
--- a/dist/wix/Product.wxs
+++ b/dist/wix/Product.wxs
@@ -25,6 +25,7 @@
 				<RegistryKey ForceCreateOnInstall="yes" ForceDeleteOnUninstall="yes" Key="Software\Microsoft\Windows NT\CurrentVersion\AppCompatFlags\Layers" Root="HKLM">
 					<RegistryValue Name="[INSTALLFOLDER]synergys.exe" Type="string" Value="~ HIGHDPIAWARE WIN7RTM"/>
 				</RegistryKey>
+				<!-- Windows 8 and later only -->
 				<Condition><![CDATA[Installed OR (VersionNT >= 602)]]></Condition>
 			</Component>
 		</DirectoryRef>
@@ -92,6 +93,7 @@
 				<File Source="$(var.QtBinPath)\Qt5Widgetsd.dll"/>
 				<File Source="$(var.QtBinPath)\libGLESv2d.dll"/>
 				<File Source="$(var.QtBinPath)\libEGLd.dll"/>
+				<!-- Hacky -->
 				<File Source="C:\Program Files (x86)\Windows Kits\10\bin\$(var.Platform)\ucrt\ucrtbased.dll"/>
 				<?else ?>
 				<File Source="$(var.QtBinPath)\Qt5Core.dll"/>