From 9fd1bfa174a8c8a5e63d875492ed01e7df34d1d7 Mon Sep 17 00:00:00 2001
From: Patrick Spendrin <ps_ml@gmx.de>
Date: Sat, 19 Dec 2015 01:16:15 +0100
Subject: [PATCH] Make it possible to ignore slproweb OpenSSL

slproweb binary installations are found by default and their file
naming convention is preferred over the ones openssl generates by
default (without MD/MT).
This change makes it possible to only find libraries without MD/MT
by setting OPENSSL_MSVC_NO_RT_MODE=TRUE
---
 Modules/FindOpenSSL.cmake | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 8b4b988..c78896b 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -38,6 +38,7 @@
 # Set ``OPENSSL_ROOT_DIR`` to the root directory of an OpenSSL installation.
 # Set ``OPENSSL_USE_STATIC_LIBS`` to ``TRUE`` to look for static libraries.
 # Set ``OPENSSL_MSVC_STATIC_RT`` set ``TRUE`` to choose the MT version of the lib.
+# Set ``OPENSSL_MSVC_NO_RT_MODE`` set ``TRUE`` to use libraries without MD / MT in their name.
 
 #=============================================================================
 # Copyright 2006-2009 Kitware, Inc.
@@ -108,7 +109,6 @@ find_path(OPENSSL_INCLUDE_DIR
   PATH_SUFFIXES
     include
 )
-
 if(WIN32 AND NOT CYGWIN)
   if(MSVC)
     # /MD and /MDd are the standard values - if someone wants to use
@@ -127,10 +127,14 @@ if(WIN32 AND NOT CYGWIN)
     # ssleay32MD.lib is identical to ../ssleay32.lib
     # enable OPENSSL_USE_STATIC_LIBS to use the static libs located in lib/VC/static
 
-    if (OPENSSL_MSVC_STATIC_RT)
-      set(_OPENSSL_MSVC_RT_MODE "MT")
+    if (NOT OPENSSL_MSVC_NO_RT_MODE)
+      if (OPENSSL_MSVC_STATIC_RT)
+        set(_OPENSSL_MSVC_RT_MODE "MT")
+      else ()
+        set(_OPENSSL_MSVC_RT_MODE "MD")
+      endif ()
     else ()
-      set(_OPENSSL_MSVC_RT_MODE "MD")
+      set(_OPENSSL_MSVC_RT_MODE "")
     endif ()
 
     if(OPENSSL_USE_STATIC_LIBS)
-- 
2.6.3.windows.1

From d37fb47f406cf961a9020598a40e4e2e781f227a Mon Sep 17 00:00:00 2001
From: Hannes Mezger <hannes.mezger@ascolab.com>
Date: Mon, 4 Apr 2016 14:23:23 +0200
Subject: [PATCH] FindOpenSSL: set NAMES_PER_DIR in all find_library
 invocations

---
 Modules/FindOpenSSL.cmake | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 8b4b988..8dbaf11 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -151,6 +151,7 @@ if(WIN32 AND NOT CYGWIN)
       NAMES
         libeay32${_OPENSSL_MSVC_RT_MODE}d
         libeay32d
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -160,6 +161,7 @@ if(WIN32 AND NOT CYGWIN)
       NAMES
         libeay32${_OPENSSL_MSVC_RT_MODE}
         libeay32
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -169,6 +171,7 @@ if(WIN32 AND NOT CYGWIN)
       NAMES
         ssleay32${_OPENSSL_MSVC_RT_MODE}d
         ssleay32d
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -179,6 +182,7 @@ if(WIN32 AND NOT CYGWIN)
         ssleay32${_OPENSSL_MSVC_RT_MODE}
         ssleay32
         ssl
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         ${_OPENSSL_PATH_SUFFIXES}
@@ -205,6 +209,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(LIB_EAY
       NAMES
         ${LIB_EAY_NAMES}
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         "lib"
@@ -214,6 +219,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(SSL_EAY
       NAMES
         ${SSL_EAY_NAMES}
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       PATH_SUFFIXES
         "lib"
@@ -231,6 +237,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(LIB_EAY
       NAMES
         libeay32
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       HINTS
         ${_OPENSSL_LIBDIR}
@@ -241,6 +248,7 @@ if(WIN32 AND NOT CYGWIN)
     find_library(SSL_EAY
       NAMES
         ssleay32
+      NAMES_PER_DIR
       ${_OPENSSL_ROOT_HINTS_AND_PATHS}
       HINTS
         ${_OPENSSL_LIBDIR}
@@ -260,6 +268,7 @@ else()
       ssl
       ssleay32
       ssleay32MD
+    NAMES_PER_DIR
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
@@ -270,6 +279,7 @@ else()
   find_library(OPENSSL_CRYPTO_LIBRARY
     NAMES
       crypto
+    NAMES_PER_DIR
     ${_OPENSSL_ROOT_HINTS_AND_PATHS}
     HINTS
       ${_OPENSSL_LIBDIR}
-- 
2.7.4.windows.1