Don't explicitly check for OpenSSL anymore, but rely on Qt

As we're not compiling against or linking to OpenSSL, but only use Qt's SSL-related
classes, it makes no sense to check for OpenSSL support ourselves. Instead, we now check
if Qt has been built with SSL support and enable our own SSL stuff in exactly this case.

This relies on Qt caring about its deps itself, though, as it already is done for the
other Qt modules.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd363bc..4a6cfa8 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -156,25 +156,22 @@ include(${QT_USE_FILE})
 include_directories(${QT_INCLUDES})
 
 # Setup OpenSSL
 include_directories(${QT_INCLUDES})
 
 # Setup OpenSSL

+# We don't link to or include OpenSSL ourselves, but use exclusively the Qt API.
+# Thus, we simply check if OpenSSL support is present in Qt's config and enable our
+# own SSL stuff in this case. Qt should care for adding what it needs itself.

 if(WITH_OPENSSL)
 if(WITH_OPENSSL)

-  find_package(OpenSSL)
+  if(QT_QCONFIG MATCHES "openssl")
+    message(STATUS "Found OpenSSL support in Qt, enabling SSL")
+    add_definitions(-DHAVE_SSL)
+    set(HAVE_SSL true)
+  else(QT_QCONFIG MATCHES "openssl")
+    message(STATUS "No OpenSSL support found in Qt, disabling SSL")
+    add_definitions(-DQT_NO_OPENSSL)
+  endif(QT_QCONFIG MATCHES "openssl")

 else(WITH_OPENSSL)
   message(STATUS "Not enabling OpenSSL support")
 endif(WITH_OPENSSL)
 
 else(WITH_OPENSSL)
   message(STATUS "Not enabling OpenSSL support")
 endif(WITH_OPENSSL)
 

-if(OPENSSL_FOUND)
-  if(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
-    message(STATUS "Found OpenSSL support in Qt")
-    add_definitions(-DHAVE_SSL)
-    set(HAVE_SSL true)
-    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_SSL)
-  else(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
-    message(STATUS "No OpenSSL support found in Qt, disabling")
-  endif(NOT QT_DEFINITIONS MATCHES "QT_NO_OPENSSL")
-else(OPENSSL_FOUND)
-  add_definitions(-DQT_NO_OPENSSL)
-endif(OPENSSL_FOUND)
-

 # Setup D-Bus support
 if(WITH_DBUS)
   if(QT_QTDBUS_FOUND)
 # Setup D-Bus support
 if(WITH_DBUS)
   if(QT_QTDBUS_FOUND)


@@ -182,7 +179,6 @@ if(WITH_DBUS)
     add_definitions(-DHAVE_DBUS)
     set(LINK_DBUS DBUS)
     set(HAVE_DBUS true)
     add_definitions(-DHAVE_DBUS)
     set(LINK_DBUS DBUS)
     set(HAVE_DBUS true)

-    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_DBUS)

   else(QT_QTDBUS_FOUND)
     message(STATUS "QtDBus not found, disabling D-Bus support")
   endif(QT_QTDBUS_FOUND)
   else(QT_QTDBUS_FOUND)
     message(STATUS "QtDBus not found, disabling D-Bus support")
   endif(QT_QTDBUS_FOUND)


@@ -197,7 +193,6 @@ if(WITH_WEBKIT)
     add_definitions(-DHAVE_WEBKIT)
     set(LINK_WEBKIT WEBKIT)
     set(HAVE_WEBKIT true)
     add_definitions(-DHAVE_WEBKIT)
     set(LINK_WEBKIT WEBKIT)
     set(HAVE_WEBKIT true)

-    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_WEBKIT)

   else(QT_QTWEBKIT_FOUND)
     message(STATUS "QtWebKit not found, disabling WebKit support")
   endif(QT_QTWEBKIT_FOUND)
   else(QT_QTWEBKIT_FOUND)
     message(STATUS "QtWebKit not found, disabling WebKit support")
   endif(QT_QTWEBKIT_FOUND)


@@ -213,7 +208,6 @@ if(WITH_KDE)
     include_directories(${KDE4_INCLUDES})
     add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
     set(HAVE_KDE 1)
     include_directories(${KDE4_INCLUDES})
     add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
     set(HAVE_KDE 1)

-    set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_KDE)

     set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_SOLID_LIBS} knotifyconfig)
     # We always use external icons for KDE4 support, since we use its iconloader rather than our own
     set(EMBED_DATA OFF)
     set(QUASSEL_KDE_LIBRARIES ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_SOLID_LIBS} knotifyconfig)
     # We always use external icons for KDE4 support, since we use its iconloader rather than our own
     set(EMBED_DATA OFF)


@@ -232,7 +226,6 @@ if(NOT HAVE_KDE)
       message(STATUS "Enabling Phonon support")
       add_definitions(-DHAVE_PHONON)
       set(HAVE_PHONON true)
       message(STATUS "Enabling Phonon support")
       add_definitions(-DHAVE_PHONON)
       set(HAVE_PHONON true)

-      set(MOC_DEFINES ${MOC_DEFINES} -DHAVE_PHONON)

     else(PHONON_FOUND)
       message(STATUS "Phonon not found, disabling audio notifications")
     endif(PHONON_FOUND)
     else(PHONON_FOUND)
       message(STATUS "Phonon not found, disabling audio notifications")
     endif(PHONON_FOUND)

diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake
index 925ab94..1956aa5 100644 (file)
--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
@@ -217,11 +217,6 @@ IF(NOT Q_WS_WIN)
   ENDIF(_QT_NEED_OPENSSL)
 ENDIF(NOT Q_WS_WIN)
 
   ENDIF(_QT_NEED_OPENSSL)
 ENDIF(NOT Q_WS_WIN)
 

-# Added by Sput. Still need to figure out why win is ignored upstream for this...
-IF(NOT QT_QCONFIG MATCHES "openssl")
-  SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
-ENDIF(NOT QT_QCONFIG MATCHES "openssl")
-

 ## dbus
 IF(QT_QCONFIG MATCHES "dbus")
 
 ## dbus
 IF(QT_QCONFIG MATCHES "dbus")