From b443e2e11d80d368934ed71648c13377816cfd09 Mon Sep 17 00:00:00 2001
From: kervala <kervala@localhost>
Date: Sun, 21 Feb 2016 14:22:18 +0100
Subject: [PATCH] Merge with develop

---
 code/CMakeLists.txt                  | 11 +++--------
 code/ryzom/client/src/CMakeLists.txt |  2 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index e0ab811a4..98c814599 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -118,6 +118,7 @@ ENDIF(WIN32)
 FIND_PACKAGE(ZLIB REQUIRED)
 FIND_PACKAGE(LibXml2 REQUIRED)
 FIND_PACKAGE(PNG REQUIRED)
+FIND_PACKAGE(OpenSSL REQUIRED)
 FIND_PACKAGE(GIF)
 FIND_PACKAGE(Jpeg)
 
@@ -342,8 +343,6 @@ IF(WITH_QT5)
 
       # Network
       SET(QT_LIBRARIES ${QT_LIBRARIES} Qt5::Network Qt5::Xml)
-
-      FIND_PACKAGE(OpenSSL REQUIRED)
       SET(QT_LIBRARIES ${QT_LIBRARIES} ${OPENSSL_LIBRARIES} ${ZLIB_LIBRARIES})
 
       IF(WIN32)
@@ -417,12 +416,8 @@ IF(WITH_NEL)
     IF(CURL_STATIC)
       SET(CURL_DEFINITIONS -DCURL_STATICLIB)
 
-      FIND_PACKAGE(OpenSSL QUIET)
-
-      IF(OPENSSL_FOUND)
-        SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
-        SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
-      ENDIF(OPENSSL_FOUND)
+      SET(CURL_INCLUDE_DIRS ${CURL_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR})
+      SET(CURL_LIBRARIES ${CURL_LIBRARIES} ${OPENSSL_LIBRARIES})
 
       IF(UNIX)
         # CURL depends on libidn
diff --git a/code/ryzom/client/src/CMakeLists.txt b/code/ryzom/client/src/CMakeLists.txt
index 4f91cfed8..5ff972398 100644
--- a/code/ryzom/client/src/CMakeLists.txt
+++ b/code/ryzom/client/src/CMakeLists.txt
@@ -137,6 +137,7 @@ IF(WITH_RYZOM_CLIENT)
         ${LUABIND_INCLUDE_DIR}
         ${CURL_INCLUDE_DIRS}
         ${ZLIB_INCLUDE_DIR}
+        ${OPENSSL_INCLUDE_DIR}
   )
 
   IF(STEAM_FOUND)
@@ -158,6 +159,7 @@ IF(WITH_RYZOM_CLIENT)
               ${LUA_LIBRARIES}
               ${LUABIND_LIBRARIES}
               ${CURL_LIBRARIES}
+              ${OPENSSL_LIBRARIES}
   )
 
   IF(NOT APPLE AND NOT WIN32)