Some buildsystem fixes for optional modules and Qt vars

[quassel.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0cf847..c1fee4a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -177,7 +177,8 @@ if(WITH_DBUS)
   if(QT_QTDBUS_FOUND)
     message(STATUS "Found QtDBus, enabling D-Bus support")
     add_definitions(-DHAVE_DBUS)
-    set(LINK_DBUS DBUS)
+    set(CLIENT_QT4_VARS ${CLIENT_QT4_VARS} DBUS)
+    set(CLIENT_COMPILE_FLAGS "${CLIENT_COMPILE_FLAGS} -DQT_DBUS_LIB")
     set(HAVE_DBUS true)
   else(QT_QTDBUS_FOUND)
     message(STATUS "QtDBus not found, disabling D-Bus support")
@@ -191,7 +192,8 @@ if(WITH_WEBKIT)
   if(QT_QTWEBKIT_FOUND)
     message(STATUS "Found QtWebKit, enabling WebKit support")
     add_definitions(-DHAVE_WEBKIT)
-    set(LINK_WEBKIT WEBKIT XMLPATTERNS)
+    set(CLIENT_QT4_VARS ${CLIENT_QT4_VARS} WEBKIT XMLPATTERNS)
+    set(CLIENT_COMPILE_FLAGS "${CLIENT_COMPILE_FLAGS} -DQT_WEBKIT_LIB -DQT_XMLPATTERNS_LIB")
     set(HAVE_WEBKIT true)
   else(QT_QTWEBKIT_FOUND)
     message(STATUS "QtWebKit not found, disabling WebKit support")