X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=0a5a3added151d56a12d2a0b66fafbc7acb77c87;hb=6ff3bc425de913a850d906c8fcb1c8088c10c1fd;hp=cb040e06cc1bcd522a01934d99e120900137b886;hpb=2273a95ba9c277ce6dd7a67158a3d3ed9f161182;p=quassel.git

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index cb040e06..0a5a3add 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -22,6 +22,7 @@ set(SOURCES
     coreconnectdlg.cpp
     coreconnectionstatuswidget.cpp
     coreinfodlg.cpp
+    coresessionwidget.cpp
     debugbufferviewoverlay.cpp
     debugconsole.cpp
     debuglogwidget.cpp
@@ -34,6 +35,7 @@ set(SOURCES
     markerlineitem.cpp
     msgprocessorstatuswidget.cpp
     nicklistwidget.cpp
+    passwordchangedlg.cpp
     qtui.cpp
     qtuiapplication.cpp
     qtuimessageprocessor.cpp
@@ -44,6 +46,7 @@ set(SOURCES
     settingspagedlg.cpp
     simplenetworkeditor.cpp
     systemtray.cpp
+    systrayanimationnotificationbackend.cpp
     systraynotificationbackend.cpp
     taskbarnotificationbackend.cpp
     titlesetter.cpp
@@ -59,41 +62,56 @@ set(FORMS
     channellistdlg.ui
     chatviewsearchbar.ui
     coreconfigwizardintropage.ui
+    coreconfigwizardauthenticationselectionpage.ui
     coreconfigwizardadminuserpage.ui
     coreconfigwizardstorageselectionpage.ui
     coreconfigwizardsyncpage.ui
     coreconnectauthdlg.ui
     coreconnectionstatuswidget.ui
     coreinfodlg.ui
+    coresessionwidget.ui
     debugbufferviewoverlay.ui
     debugconsole.ui
     debuglogwidget.ui
     inputwidget.ui
     msgprocessorstatuswidget.ui
     nicklistwidget.ui
+    passwordchangedlg.ui
+    receivefiledlg.ui
     settingsdlg.ui
     settingspagedlg.ui
     simplenetworkeditor.ui
-    receivefiledlg.ui
+    systrayanimationconfigwidget.ui
     topicwidget.ui
 )
 
 set(LIBS )
 set(QT_MODULES )
 
-if (KDE4_FOUND)
+if (WITH_KDE4)
     add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
     include_directories(${KDE4_INCLUDES})
     list(APPEND SOURCES knotificationbackend.cpp)
     list(APPEND LIBS ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBRARY} ${KDE4_KNOTIFYCONFIG_LIBRARY})
 endif()
 
-if (LIBSNORE_FOUND)
-    add_definitions(-DHAVE_SNORENOTIFY)
-    include_directories(${LIBSNORE_INCLUDE_DIRS})
+if (WITH_KF5)
+    list(APPEND SOURCES knotificationbackend.cpp)
+    list(APPEND LIBS KF5::ConfigWidgets KF5::Notifications KF5::NotifyConfig KF5::WidgetsAddons KF5::XmlGui)
+endif()
+
+if (LibsnoreQt5_FOUND)
+    add_definitions(-DHAVE_LIBSNORE)
     list(APPEND SOURCES snorenotificationbackend.cpp)
     list(APPEND FORMS   snorentificationconfigwidget.ui)
-    list(APPEND LIBS ${LIBSNORE_LIBRARIES})
+    list(APPEND LIBS    Snore::Libsnore Snore::LibsnoreSettings)
+endif()
+
+if (Qt5Multimedia_FOUND)
+    add_definitions(-DHAVE_QTMULTIMEDIA)
+    list(APPEND QT_MODULES Multimedia)
+    set(SOURCES ${SOURCES} qtmultimedianotificationbackend.cpp)
+    set(FORMS ${FORMS}     qtmultimedianotificationconfigwidget.ui)
 endif()
 
 if (PHONON_FOUND OR Phonon4Qt5_FOUND)
@@ -110,7 +128,11 @@ if (QT_QTDBUS_FOUND OR Qt5DBus_FOUND)
     if (dbusmenu-qt_FOUND OR dbusmenu-qt5_FOUND)
         add_definitions(-DHAVE_DBUSMENU)
         include_directories(${dbusmenu-qt_INCLUDE_DIRS} ${dbusmenu-qt5_INCLUDE_DIRS})
-        list(APPEND LIBS ${dbusmenu-qt_LIBRARIES} ${dbusmenu-qt5_LIBRARIES})
+        if (dbusmenu-qt_FOUND)
+            list(APPEND LIBS dbusmenu-qt)
+        else()
+            list(APPEND LIBS dbusmenu-qt5)
+        endif()
     endif()
 
     list(APPEND SOURCES statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
@@ -119,15 +141,26 @@ 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 (HAVE_WEBKIT)
     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_WEBENGINE)
+    add_definitions(-DHAVE_WEBENGINE)
+    list(APPEND QT_MODULES WebEngine)
+    if (USE_QT5)
+        list(APPEND QT_MODULES WebEngineWidgets)
+    endif()
 endif()
 
 if(HAVE_SSL)
   set(SOURCES ${SOURCES} sslinfodlg.cpp)
   set(FORMS ${FORMS} sslinfodlg.ui)
-endif(HAVE_SSL)
+endif()
 
 if (INDICATEQT_FOUND)
     add_definitions(-DHAVE_INDICATEQT)
@@ -143,6 +176,12 @@ if (WITH_NOTIFICATION_CENTER)
     list(APPEND LIBS "/System/Library/Frameworks/Foundation.framework")
 endif()
 
+if (KF5Sonnet_FOUND)
+    add_definitions(-DHAVE_SONNET)
+    list(APPEND SOURCES settingspages/sonnetsettingspage.cpp)
+    list(APPEND LIBS KF5::SonnetUi)
+endif()
+
 foreach(FORM ${FORMS})
   set(FORMPATH ${FORMPATH} ui/${FORM})
 endforeach(FORM ${FORMS})
@@ -165,7 +204,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})
@@ -178,8 +216,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})