Fix SSL detection

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3caf61e..0b1d3e5 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -420,6 +420,20 @@ if (NOT WIN32)
     )
 endif()
 
     )
 endif()
 

+# Check for SSL support in Qt
+# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile
+# a small test program checking the defines. This works for both Qt4 and Qt5.
+cmake_push_check_state(RESET)
+set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
+check_cxx_source_compiles("
+    #include \"qglobal.h\"
+    #if defined QT_NO_OPENSSL || defined QT_NO_SSL
+    #  error \"No SSL support\"
+    #endif
+    int main() {}"
+    HAVE_SSL)
+cmake_pop_check_state()

 
 # Additional compile settings
 #####################################################################
 
 # Additional compile settings
 #####################################################################


@@ -483,20 +497,6 @@ if (NOT ZLIB_FOUND)
     endif()
 endif()
 
     endif()
 endif()
 

-# Check for SSL support in Qt
-# As there's no easy way to get Qt's configuration in particular for Qt5, let's just compile
-# a small test program checking the defines. This works for both Qt4 and Qt5.
-cmake_push_check_state(RESET)
-set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUDES} ${Qt5Core_INCLUDE_DIRS})
-check_cxx_source_compiles("
-    #include \"qglobal.h\"
-    #if defined QT_NO_OPENSSL || defined QT_NO_SSL
-    #  error \"No SSL support\"
-    #endif
-    int main() {}"
-    HAVE_SSL)
-cmake_pop_check_state()
-

 if (HAVE_SSL)
     add_definitions(-DHAVE_SSL)
 endif()
 if (HAVE_SSL)
     add_definitions(-DHAVE_SSL)
 endif()