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=-c

Merge pull request #175 from ayonix/ssl-fix

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

07d99f2b05f61df83278021d041d9e701a14f0d9
diff --combined CMakeLists.txt
index 2c29af44,03aabeed..046b66d8
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -217,21 -217,12 +217,21 @@@ if (USE_QT5
              PURPOSE     "Required for audio notifications"
          )
  
 -        find_package(LibsnoreQt5 0.5.70 QUIET)
 +        find_package(LibsnoreQt5 0.7.0 QUIET)
          set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
              URL "https://projects.kde.org/projects/playground/libs/snorenotify"
              DESCRIPTION "a cross-platform notification framework"
              PURPOSE     "Enable support for the snorenotify framework"
          )
 +        if(LibsnoreQt5_FOUND)
 +            find_package(LibsnoreSettingsQt5)
 +            set_package_properties(LibsnoreSettingsQt5 PROPERTIES TYPE REQUIRED
 +                URL "https://projects.kde.org/projects/playground/libs/snorenotify"
 +                DESCRIPTION "a cross-platform notification framework"
 +                PURPOSE     "Enable support for the snorenotify framework"
 +            )
 +        endif()
 +        
  
          if (WITH_WEBKIT)
              find_package(Qt5WebKit QUIET)
@@@ -430,7 -421,7 +430,7 @@@ set(CMAKE_REQUIRED_INCLUDES ${QT_INCLUD
  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() {}"