From e86029d7ea7ddf0ed904fef64c3cb58d6985d3ea Mon Sep 17 00:00:00 2001
From: Andrew Nelless <andrew@symless.com>
Date: Tue, 3 Jan 2017 23:39:19 +0000
Subject: [PATCH] Fix up OpenSSL paths in CMake and WiX

---
 CMakeLists.txt              | 24 ++++++++----------------
 src/setup/win32/Include.wxi |  4 ++--
 src/setup/win32/Product.wxs |  6 +++---
 3 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 064b18f9..a8a221c7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,32 +324,24 @@ endif()
 
 if (WIN32)
 	if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-		set(OPENSSL_PLAT_DIR openssl-win64)
+        set(OPENSSL_ARCH_DIR win64)
 	else()
-		set(OPENSSL_PLAT_DIR openssl-win32)
+        set(OPENSSL_ARCH_DIR win32)
 	endif()
-	set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32)
-endif()
-
-if (APPLE)
-	set(OPENSSL_PLAT_DIR openssl-osx)
-	set(OPENSSL_ARCH_DIR x86_64)
-	set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/${OPENSSL_ARCH_DIR}/include)
-endif()
-
-if (WIN32)
+    set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/include)
 	set(OPENSSL_LIBS
-		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib
-		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib
+        ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/lib/libeay32.lib
+        ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/lib/ssleay32.lib
 	)
 endif()
 
 if (UNIX)
 	if (APPLE)
+        set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/osx/include)
 		set(OPENSSL_ARCH_DIR x86_64)
 		set(OPENSSL_LIBS
-		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/${OPENSSL_ARCH_DIR}/libssl.a
-		${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/${OPENSSL_ARCH_DIR}/libcrypto.a
+            ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/osx/${OPENSSL_ARCH_DIR}/libssl.a
+            ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/osx/${OPENSSL_ARCH_DIR}/libcrypto.a
 		)
 	else()
 		set(OPENSSL_LIBS ssl crypto)
diff --git a/src/setup/win32/Include.wxi b/src/setup/win32/Include.wxi
index a5ed1852..58acf7b9 100644
--- a/src/setup/win32/Include.wxi
+++ b/src/setup/win32/Include.wxi
@@ -19,14 +19,14 @@
   <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
   <?define PlatformSimpleName="64-bit" ?>
   <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
-  <?define var.OpensslPath="openssl-win64" ?>
+  <?define var.OpensslPath="openssl/win64" ?>
   <?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
   <?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
   <?else?>
   <?define ProgramFilesFolder="ProgramFilesFolder" ?>
   <?define PlatformSimpleName="32-bit" ?>
   <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
-  <?define var.OpensslPath="openssl-win32" ?>
+  <?define var.OpensslPath="openssl/win32" ?>
   <?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
   <?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
   <?endif?>
diff --git a/src/setup/win32/Product.wxs b/src/setup/win32/Product.wxs
index 36194158..10323d1d 100644
--- a/src/setup/win32/Product.wxs
+++ b/src/setup/win32/Product.wxs
@@ -152,9 +152,9 @@
 
     <ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir">
       <Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1">
-        <File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/libeay32.dll" Id="OpenSslDll1" />
-        <File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/ssleay32.dll" Id="OpenSslDll2" />
-        <File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/openssl.exe" />
+        <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/libeay32.dll" Id="OpenSslDll1" />
+        <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll" Id="OpenSslDll2" />
+        <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe" />
         <File Source="$(var.ResPath)/openssl/synergy.conf" />
       </Component>
     </ComponentGroup>