Use link dependencies between Quassel modules

[quassel.git] / src / qtui / CMakeLists.txt

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index 5c7371e..c9274a2 100644 (file)
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -89,7 +89,7 @@ if (KDE4_FOUND)
 endif()
 
 if (LIBSNORE_FOUND)
-    add_definitions(-DHAVE_SNORENOTIFY)
+    add_definitions(-DHAVE_LIBSNORE)
     include_directories(${LIBSNORE_INCLUDE_DIRS})
     list(APPEND SOURCES snorenotificationbackend.cpp)
     list(APPEND FORMS   snorentificationconfigwidget.ui)
@@ -123,9 +123,12 @@ 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 Qt5Webkit_FOUND)
+if (QT_QTWEBKIT_FOUND OR Qt5WebKitWidgets_FOUND)
     add_definitions(-DHAVE_WEBKIT)
-    list(APPEND QT_MODULES Webkit XmlPatterns)
+    list(APPEND QT_MODULES WebKit)
+    if (USE_QT5)
+        list(APPEND QT_MODULES WebKitWidgets)
+    endif()
 endif()
 
 if(HAVE_SSL)
@@ -169,7 +172,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src/common
                     ${CMAKE_SOURCE_DIR}/src/qtui
                     ${CMAKE_SOURCE_DIR}/src/qtui/settingspages
                     ${CMAKE_SOURCE_DIR}/src/uisupport
-
 )
 
 qt_wrap_ui(UI ${FORMPATH} ${SPFRM})
@@ -182,8 +184,4 @@ endif()
 add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${UI})
 qt_use_modules(mod_qtui Core Gui Network ${QT_MODULES})
 
-if (LIBS)
-    target_link_libraries(mod_qtui ${LIBS})
-endif()
-
-add_dependencies(mod_qtui mod_common mod_client mod_uisupport)
+target_link_libraries(mod_qtui mod_client mod_common mod_uisupport ${LIBS})