From 450181f2442655b45c9f988650858ac64c5329e6 Mon Sep 17 00:00:00 2001
From: kervala <none@none>
Date: Tue, 3 Oct 2017 14:32:13 +0200
Subject: [PATCH] Fixed: Always link to Crypt32.lib for OpenSSL under Windows

--HG--
branch : develop
---
 code/CMakeLists.txt               | 6 ++++--
 code/CMakeModules/FindMySQL.cmake | 3 +++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index cce763bac..0e72cc5f9 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -112,6 +112,10 @@ FIND_PACKAGE(OpenSSL REQUIRED)
 FIND_PACKAGE(GIF)
 FIND_PACKAGE(Jpeg)
 
+IF(WIN32)
+  SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
+ENDIF()
+
 IF(WITH_LIBOVR)
   FIND_PACKAGE(LibOVR)
 ENDIF()
@@ -443,8 +447,6 @@ IF(WITH_NEL)
             SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${INTL_LIBRARY})
           ENDIF()
         ENDIF()
-      ELSEIF(WIN32)
-        SET(CURL_LIBRARIES ${CURL_LIBRARIES} Crypt32.lib)
       ENDIF()
     ENDIF()
   ENDIF()
diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index f2b62fc59..8a92cb0c4 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -69,6 +69,9 @@ ELSE()
       ENDIF()
       FIND_PACKAGE(OpenSSL)
       IF(OPENSSL_FOUND)
+        IF(WIN32)
+          SET(OPENSSL_LIBRARIES ${OPENSSL_LIBRARIES} Crypt32.lib)
+        ENDIF()
         SET(MYSQL_LIBRARIES ${MYSQL_LIBRARIES} ${OPENSSL_LIBRARIES})
       ENDIF()
     ENDIF()