Improve (hopefully fix) OpenSSL recognition

[quassel.git] / cmake / modules / FindQt4.cmake

diff --git a/cmake/modules/FindQt4.cmake b/cmake/modules/FindQt4.cmake
index f67395b..ebd0106 100644 (file)
--- a/cmake/modules/FindQt4.cmake
+++ b/cmake/modules/FindQt4.cmake
@@ -287,9 +287,9 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
 
 SET( QT_DEFINITIONS "")
 
-IF (WIN32)
+IF (WIN32 AND NOT STATIC)
   SET(QT_DEFINITIONS -DQT_DLL)
-ENDIF(WIN32)
+ENDIF(WIN32 AND NOT STATIC)
 
 SET(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
 
@@ -1456,6 +1456,11 @@ IF (QT4_QMAKE_FOUND)
     # Trolltech said they'd consider exporting it for all platforms in future releases.
     SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_SHARED)
   ENDIF(NOT QT_CONFIG MATCHES "static")
+
+  # OpenSSL
+  IF(NOT QT_QCONFIG MATCHES "openssl")
+    SET(QT_DEFINITIONS ${QT_DEFINITIONS} -DQT_NO_OPENSSL)
+  ENDIF(NOT QT_QCONFIG MATCHES "openssl")
   
   ## system png
   IF(QT_QCONFIG MATCHES "system-png")