From 97b566729782d473f9417bd6d6813dba6c0adccb Mon Sep 17 00:00:00 2001
From: Jason Haslam <jason@scitools.com>
Date: Thu, 24 Jan 2019 20:33:34 -0700
Subject: [PATCH] Search for OpenSSL 1.1 on Windows

---
 dep/openssl/CMakeLists.txt | 6 +-----
 pack/CMakeLists.txt        | 2 +-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dep/openssl/CMakeLists.txt b/dep/openssl/CMakeLists.txt
index 359824c5..b36e5297 100644
--- a/dep/openssl/CMakeLists.txt
+++ b/dep/openssl/CMakeLists.txt
@@ -4,8 +4,4 @@ else()
   set(OPENSSL_DIR ${CMAKE_CURRENT_SOURCE_DIR}/openssl CACHE PATH "")
 endif()
 
-if(WIN32)
-  set(OPENSSL_ROOT_DIR ${OPENSSL_DIR}/inc32 ${OPENSSL_DIR}/out32dll PARENT_SCOPE)
-else()
-  set(OPENSSL_ROOT_DIR ${OPENSSL_DIR} PARENT_SCOPE)
-endif()
+set(OPENSSL_ROOT_DIR ${OPENSSL_DIR} PARENT_SCOPE)
diff --git a/pack/CMakeLists.txt b/pack/CMakeLists.txt
index 662ec552..f1ee3354 100644
--- a/pack/CMakeLists.txt
+++ b/pack/CMakeLists.txt
@@ -159,7 +159,7 @@ if(NOT APPLE)
   endif()
 
   foreach(SSL_LIB_NAME ssl crypto)
-    set(SSL_LIB "${OPENSSL_LIB}/lib${SSL_LIB_NAME}${SSL_LIB_SUFFIX}")
+    set(SSL_LIB "${OPENSSL_DIR}/lib${SSL_LIB_NAME}${SSL_LIB_SUFFIX}")
 
     if(WIN32)
       # Copy into build dir.