From: Deiz <silverwraithii@gmail.com>
Date: Fri, 8 May 2015 19:37:52 +0000 (-0400)
Subject: Respect WITH_WEBKIT when defining HAVE_WEBKIT
X-Git-Tag: travis-deploy-test~564^2
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=146bbbafeddef8d770af3f91d69c9ff420e39229;hp=92490c7390f21d59a0df540c4bdcbb1de69e7e8e

Respect WITH_WEBKIT when defining HAVE_WEBKIT
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8739738..a1f79a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -240,7 +240,11 @@ if (USE_QT5)
                 )
             endif()
         endif()
-        add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" Qt5WebKitWidgets_FOUND "Support showing previews for URLs in chat")
+
+        if (WITH_WEBKIT AND Qt5WebKitWidgets_FOUND)
+            set(HAVE_WEBKIT true)
+        endif()
+        add_feature_info("WITH_WEBKIT, QtWebKit and QtWebKitWidgets modules" HAVE_WEBKIT "Support showing previews for URLs in chat")
 
         # KDE Frameworks
         ################
diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index be9a14b5..13279baa 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -130,7 +130,7 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND)
     qt_add_dbus_adaptor  (SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
 endif()
 
-if (QT_QTWEBKIT_FOUND OR Qt5WebKitWidgets_FOUND)
+if (HAVE_WEBKIT)
     add_definitions(-DHAVE_WEBKIT)
     list(APPEND QT_MODULES WebKit)
     if (USE_QT5)