From 83021e6dd716b2f80150d1f583e6876a1be42d58 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 14 Dec 2015 07:50:45 +0200
Subject: [PATCH] move QT_NO_OPENSSL to top-level cmake file, fix build without
 openssl

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 CMakeLists.txt             |  4 ++++
 src/network/CMakeLists.txt |  6 +-----
 src/network/ssl/ssl.cmake  | 12 +++++++-----
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c10b6023d..1ec3ef239 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -462,6 +462,10 @@ if(NOT WTIH_EGL OR NOT EGL_FOUND)
     katie_definition(-DQT_NO_EGL)
 endif()
 
+if(NOT WITH_OPENSSL OR NOT OPENSSL_FOUND)
+    katie_definition(-DQT_NO_OPENSSL)
+endif()
+
 # major components
 add_subdirectory(src/core)
 add_subdirectory(src/xml)
diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
index 075590ad6..c1f3d204a 100644
--- a/src/network/CMakeLists.txt
+++ b/src/network/CMakeLists.txt
@@ -51,11 +51,7 @@ include(access/access.cmake)
 include(bearer/bearer.cmake)
 include(kernel/kernel.cmake)
 include(socket/socket.cmake)
-if(WITH_OPENSSL AND OPENSSL_FOUND)
-    include(ssl/ssl.cmake)
-else()
-    katie_definition(-DQT_NO_OPENSSL)
-endif()
+include(ssl/ssl.cmake)
 
 include_directories(
     ${CMAKE_BINARY_DIR}/include
diff --git a/src/network/ssl/ssl.cmake b/src/network/ssl/ssl.cmake
index c1e024cd5..b404babc9 100644
--- a/src/network/ssl/ssl.cmake
+++ b/src/network/ssl/ssl.cmake
@@ -28,8 +28,10 @@ set(NETWORK_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/ssl/qsslsocket_openssl_symbols.cpp
 )
 
-set(EXTRA_NETWORK_LIBS
-    ${EXTRA_NETWORK_LIBS}
-    ${OPENSSL_LIBRARIES}
-)
-include_directories(${OPENSSL_INCLUDE_DIR})
\ No newline at end of file
+if(WITH_OPENSSL AND OPENSSL_FOUND)
+    set(EXTRA_NETWORK_LIBS
+        ${EXTRA_NETWORK_LIBS}
+        ${OPENSSL_LIBRARIES}
+    )
+    include_directories(${OPENSSL_INCLUDE_DIR})
+endif()
-- 
2.11.0