Don't require X11 headers for building quasselcore

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

diff --git a/cmake/modules/Qt4ConfigDependentSettings.cmake b/cmake/modules/Qt4ConfigDependentSettings.cmake
index 925ab94..a6b6c3d 100644 (file)
--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
@@ -27,7 +27,7 @@
 IF(UNIX)
   # on OS X X11 may not be required
   IF (Q_WS_X11)
-    FIND_PACKAGE(X11 REQUIRED)
+    FIND_PACKAGE(X11)
   ENDIF (Q_WS_X11)
   FIND_PACKAGE(Threads)
   SET(QT_QTCORE_LIBRARY ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
@@ -217,11 +217,6 @@ IF(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")