From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 8 Feb 2016 20:33:53 +0000 (+0100)
Subject: Merge pull request #175 from ayonix/ssl-fix
X-Git-Tag: travis-deploy-test~527
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=07d99f2b05f61df83278021d041d9e701a14f0d9;hp=ecf1ab29dd398f0e0beaff327443909096d24f55

Merge pull request #175 from ayonix/ssl-fix

Fix the SSL check on systems that don't use OpenSSL
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c29af44..046b66d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,7 +430,7 @@ 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
+    #if defined QT_NO_SSL
     #  error \"No SSL support\"
     #endif
     int main() {}"