X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=CMakeLists.txt;h=1a05ed5263c3a35a19f25d5bb96b75f4f1038dbb;hp=0e9296bb20497795cdfc28c536f27b659ef16c81;hb=6ada5e90bd87dba5fcb71b7a696fd99ac7676bd7;hpb=0e755439e2447649e91c2d016e088b05b4637add

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e9296bb..1a05ed52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,14 +76,14 @@ if (NOT WITH_KDE)
 endif()
 
 # For this, the feature info is added after we know if QtWebkit is installed
-option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" ON)
+option(WITH_WEBKIT "WebKit support (for link previews) (legacy)" OFF)
 
 # For this, the feature info is added after we know if QtWebEngine is installed
 option(WITH_WEBENGINE "WebEngine support (for link previews)" ON)
 
 if (APPLE)
     # Notification Center is only available in > 10.8, which is Darwin v12
-    if (CMAKE_SYSTEM_VERSION VERSION_GREATER "11.9.9")
+    if (NOT CMAKE_SYSTEM_VERSION VERSION_LESS 12)
         option(WITH_NOTIFICATION_CENTER "OS X Notification Center support" ON)
         add_feature_info(WITH_NOTIFICATION_CENTER WITH_NOTIFICATION_CENTER "Use the OS X Notification Center")
     endif()
@@ -154,22 +154,6 @@ endif()
 # Set up Qt
 #####################################################################
 
-if (USE_QT5)
-    message(STATUS "Building for Qt5...")
-    set(QT_MIN_VERSION "5.2.0")
-    add_definitions(-DHAVE_QT5)
-else()
-    message(STATUS "Building for Qt4...")
-    set(QT_MIN_VERSION "4.8.0")
-
-    # Select a Qt installation here, if you don't want to use system Qt
-    if(QT_PATH)
-        # FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH
-        set(ENV{PATH} ${QT_PATH}/bin:$ENV{PATH})
-    endif()
-endif()
-
-
 # Find package dependencies
 #
 # Note that you can forcefully disable optional packages
@@ -177,6 +161,10 @@ endif()
 #####################################################################
 
 if (USE_QT5)
+    message(STATUS "Building for Qt5...")
+    set(QT_MIN_VERSION "5.2.0")
+    add_definitions(-DHAVE_QT5)
+
     find_package(Qt5Core ${QT_MIN_VERSION} QUIET)
     set_package_properties(Qt5Core PROPERTIES TYPE REQUIRED
         URL "http://qt.digia.com"
@@ -203,19 +191,21 @@ if (USE_QT5)
             DESCRIPTION "the widgets module for Qt5"
         )
 
-        find_package(Qt5DBus QUIET)
-        set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED
-            URL "http://qt.digia.com"
-            DESCRIPTION "D-Bus support for Qt5"
-            PURPOSE     "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments"
-        )
-        if (Qt5DBus_FOUND)
-            find_package(dbusmenu-qt5 QUIET CONFIG)
-            set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED
-                URL "https://launchpad.net/libdbusmenu-qt"
-                DESCRIPTION "a library implementing the DBusMenu specification"
-                PURPOSE     "Required for having a context menu for the D-Bus-based tray icon"
+        if (NOT WIN32)
+            find_package(Qt5DBus QUIET)
+            set_package_properties(Qt5DBus PROPERTIES TYPE RECOMMENDED
+                URL "http://qt.digia.com"
+                DESCRIPTION "D-Bus support for Qt5"
+                PURPOSE     "Needed for supporting D-Bus-based notifications and tray icon, used by most modern desktop environments"
             )
+            if (Qt5DBus_FOUND)
+                find_package(dbusmenu-qt5 QUIET CONFIG)
+                set_package_properties(dbusmenu-qt5 PROPERTIES TYPE RECOMMENDED
+                    URL "https://launchpad.net/libdbusmenu-qt"
+                    DESCRIPTION "a library implementing the DBusMenu specification"
+                    PURPOSE     "Required for having a context menu for the D-Bus-based tray icon"
+                )
+            endif()
         endif()
 
         find_package(Phonon4Qt5 QUIET)
@@ -364,6 +354,15 @@ if (USE_QT5)
     endif()
 
 else(USE_QT5)
+    message(STATUS "Building for Qt4...")
+    set(QT_MIN_VERSION "4.8.0")
+
+    # Select a Qt installation here, if you don't want to use system Qt
+    if(QT_PATH)
+        # FindQt4 will look for the qmake binary in $PATH, so we just prepend QT_PATH
+        set(ENV{PATH} ${QT_PATH}/bin:$ENV{PATH})
+    endif()
+
     find_package(Qt4 ${QT_MIN_VERSION} QUIET REQUIRED)
 
     if (BUILD_GUI)