X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2FCMakeLists.txt;h=034d6c6ed79e4896453a52d05d2cc486f6f58dae;hp=e2f7eb06d3a73cfbaf6cb2f7d41ab2f1eaecee52;hb=42d328e94a3bed8e6b0a32e7a234281e6d184325;hpb=5b43f2776fa53bfe15a5b3b4398dfe3e931d5802

diff --git a/src/qtui/CMakeLists.txt b/src/qtui/CMakeLists.txt
index e2f7eb06..034d6c6e 100644
--- a/src/qtui/CMakeLists.txt
+++ b/src/qtui/CMakeLists.txt
@@ -1,6 +1,6 @@
-# Builds the qtui module
+quassel_add_module(QtUi EXPORT)
 
-set(SOURCES
+target_sources(${TARGET} PRIVATE
     aboutdlg.cpp
     awaylogfilter.cpp
     awaylogview.cpp
@@ -22,9 +22,9 @@ set(SOURCES
     coreconnectdlg.cpp
     coreconnectionstatuswidget.cpp
     coreinfodlg.cpp
+    coresessionwidget.cpp
     debugbufferviewoverlay.cpp
-    debugconsole.cpp
-    debuglogwidget.cpp
+    debuglogdlg.cpp
     debugmessagemodelfilter.cpp
     inputwidget.cpp
     ircconnectionwizard.cpp
@@ -34,125 +34,166 @@ set(SOURCES
     markerlineitem.cpp
     msgprocessorstatuswidget.cpp
     nicklistwidget.cpp
+    passwordchangedlg.cpp
     qtui.cpp
     qtuiapplication.cpp
     qtuimessageprocessor.cpp
     qtuisettings.cpp
     qtuistyle.cpp
     receivefiledlg.cpp
+    resourcetreedlg.cpp
     settingsdlg.cpp
     settingspagedlg.cpp
     simplenetworkeditor.cpp
     systemtray.cpp
+    systrayanimationnotificationbackend.cpp
     systraynotificationbackend.cpp
     taskbarnotificationbackend.cpp
     titlesetter.cpp
     topicwidget.cpp
     verticaldock.cpp
     webpreviewitem.cpp
-)
 
-set(FORMS
+    # UI files
     aboutdlg.ui
     bufferviewwidget.ui
     bufferwidget.ui
     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
+    debuglogdlg.ui
     inputwidget.ui
     msgprocessorstatuswidget.ui
     nicklistwidget.ui
+    passwordchangedlg.ui
+    receivefiledlg.ui
+    resourcetreedlg.ui
     settingsdlg.ui
     settingspagedlg.ui
     simplenetworkeditor.ui
-    receivefiledlg.ui
-    topicwidget.ui)
-
-if(HAVE_KDE)
-  set(SOURCES ${SOURCES} knotificationbackend.cpp)
-else(HAVE_KDE)
-  if(HAVE_SNORENOTIFY)
-    set(SOURCES ${SOURCES} snorenotificationbackend.cpp)
-    set(FORMS ${FORMS} snorentificationconfigwidget.ui)
-  endif(HAVE_SNORENOTIFY)
-  if(HAVE_PHONON)
-    set(SOURCES ${SOURCES} phononnotificationbackend.cpp)
-    set(FORMS ${FORMS} phononnotificationconfigwidget.ui)
-    include_directories(${PHONON_INCLUDES})
-  endif(HAVE_PHONON)
-endif(HAVE_KDE)
-
-if (HAVE_DBUS)
-    set(SOURCES ${SOURCES} statusnotifieritem.cpp statusnotifieritemdbus.cpp dockmanagernotificationbackend.cpp)
-    qt_add_dbus_interface(DBUS ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
-    qt_add_dbus_interface(DBUS ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
-    qt_add_dbus_adaptor(DBUS ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
-endif(HAVE_DBUS)
-
-if(HAVE_SSL)
-  set(SOURCES ${SOURCES} sslinfodlg.cpp)
-  set(FORMS ${FORMS} sslinfodlg.ui)
-endif(HAVE_SSL)
-
-if(INDICATEQT_FOUND)
-  set(SOURCES ${SOURCES} indicatornotificationbackend.cpp)
-  set(FORMS ${FORMS} indicatornotificationconfigwidget.ui)
-  include_directories(${INDICATEQT_INCLUDE_DIRS})
-endif(INDICATEQT_FOUND)
-
-if(HAVE_NOTIFICATION_CENTER)
-  set(SOURCES ${SOURCES} osxnotificationbackend.mm)
-endif()
-
-foreach(FORM ${FORMS})
-  set(FORMPATH ${FORMPATH} ui/${FORM})
-endforeach(FORM ${FORMS})
+    systrayanimationconfigwidget.ui
+    topicwidget.ui
+)
 
-# handle settingspages
+# Handle settingspages
+target_include_directories(${TARGET} PRIVATE settingspages)
 include(settingspages/settingspages.cmake)
-foreach(SP ${SETTINGSPAGES})
-  set(SPSRC ${SPSRC} settingspages/${SP}settingspage.cpp)
-  set(SPFRM ${SPFRM} settingspages/${SP}settingspage.ui)
-endforeach(SP ${SETTINGSPAGES})
-foreach(SRC ${SP_SOURCES})
-  set(SPSRC ${SPSRC} settingspages/${SRC})
-endforeach(SRC ${SP_SOURCES})
-foreach(FRM ${SP_FORMS})
-  set(SPFRM ${SPFRM} settingspages/${FRM})
-endforeach(FRM ${SP_FORMS})
-
-include_directories(${CMAKE_SOURCE_DIR}/src/common
-                    ${CMAKE_SOURCE_DIR}/src/client
-                    ${CMAKE_SOURCE_DIR}/src/qtui
-                    ${CMAKE_SOURCE_DIR}/src/qtui/settingspages
-                    ${CMAKE_SOURCE_DIR}/src/uisupport
-
+foreach(page ${SETTINGSPAGES})
+    target_sources(${TARGET} PRIVATE
+        settingspages/${page}settingspage.cpp
+        settingspages/${page}settingspage.ui
+    )
+endforeach()
+foreach(src ${SP_SOURCES})
+    target_sources(${TARGET} PRIVATE settingspages/${src})
+endforeach()
+foreach(form ${SP_FORMS})
+    target_sources(${TARGET} PRIVATE settingspages/${form})
+endforeach()
+
+target_link_libraries(${TARGET}
+    PUBLIC
+        Qt5::Core
+        Qt5::Gui
+        Qt5::Network
+        Qt5::Widgets
+        Quassel::UiSupport
+        Quassel::Client
+        Quassel::Common
 )
 
-qt_wrap_ui(UI ${FORMPATH} ${SPFRM})
+if (WITH_KDE)
+    target_sources(${TARGET} PRIVATE knotificationbackend.cpp)
+    target_link_libraries(${TARGET} PUBLIC
+        KF5::ConfigWidgets
+        KF5::Notifications
+        KF5::NotifyConfig
+        KF5::WidgetsAddons
+        KF5::XmlGui
+    )
+endif()
+
+if (KF5Sonnet_FOUND)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_SONNET)
+    target_sources(${TARGET} PRIVATE settingspages/sonnetsettingspage.cpp)
+    target_link_libraries(${TARGET} PRIVATE KF5::SonnetUi)
+endif()
 
-if (WITH_QT5)
-    list(APPEND qt_modules Widgets)
+if (Qt5Multimedia_FOUND)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_QTMULTIMEDIA)
+    target_sources(${TARGET} PRIVATE
+        qtmultimedianotificationbackend.cpp
+        qtmultimedianotificationconfigwidget.ui
+    )
+    target_link_libraries(${TARGET} PRIVATE Qt5::Multimedia)
 endif()
 
-if (HAVE_DBUS)
-    list(APPEND qt_modules DBus)
+if (Qt5DBus_FOUND)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_DBUS)
+    target_link_libraries(${TARGET} PRIVATE Qt5::DBus)
+    if (dbusmenu-qt5_FOUND)
+        target_compile_definitions(${TARGET} PRIVATE -DHAVE_DBUSMENU)
+        target_link_libraries(${TARGET} PRIVATE dbusmenu-qt5)
+    endif()
+
+    qt5_add_dbus_interface(DBUS_SOURCES ../../interfaces/org.kde.StatusNotifierWatcher.xml statusnotifierwatcher)
+    qt5_add_dbus_interface(DBUS_SOURCES ../../interfaces/org.freedesktop.Notifications.xml notificationsclient)
+    qt5_add_dbus_adaptor  (DBUS_SOURCES ../../interfaces/org.kde.StatusNotifierItem.xml statusnotifieritemdbus.h StatusNotifierItemDBus)
+
+    target_sources(${TARGET} PRIVATE
+        dockmanagernotificationbackend.cpp
+        statusnotifieritem.cpp
+        statusnotifieritemdbus.cpp
+        ${DBUS_SOURCES}
+    )
 endif()
 
 if (HAVE_WEBKIT)
-    list(APPEND qt_modules Webkit XmlPatterns)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_WEBKIT)
+    target_link_libraries(${TARGET} PRIVATE
+        Qt5::WebKit
+        Qt5::WebKitWidgets
+    )
 endif()
 
-add_library(mod_qtui STATIC ${SOURCES} ${SPSRC} ${DBUS} ${UI})
-qt_use_modules(mod_qtui Core Gui Network ${qt_modules})
+if (HAVE_WEBENGINE)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_WEBENGINE)
+    target_link_libraries(${TARGET} PRIVATE
+        Qt5::WebEngine
+        Qt5::WebEngineWidgets)
+endif()
 
-add_dependencies(mod_qtui mod_common mod_client mod_uisupport)
+if (HAVE_SSL)
+    target_sources(${TARGET} PRIVATE
+        sslinfodlg.cpp
+        sslinfodlg.ui
+    )
+endif()
+
+if (LibsnoreQt5_FOUND)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_LIBSNORE)
+    target_sources(${TARGET} PRIVATE
+        snorenotificationbackend.cpp
+        snorentificationconfigwidget.ui
+    )
+    target_link_libraries(${TARGET} PRIVATE Snore::Libsnore Snore::LibsnoreSettings)
+endif()
+
+if (WITH_NOTIFICATION_CENTER)
+    target_compile_definitions(${TARGET} PRIVATE -DHAVE_NOTIFICATION_CENTER)
+    target_sources(${TARGET} PRIVATE osxnotificationbackend.mm)
+    target_link_libraries(${TARGET} PRIVATE "/System/Library/Frameworks/Foundation.framework")
+endif()
+
+if (WITH_OXYGEN_ICONS)
+    set_property(SOURCE qtui.cpp APPEND PROPERTY COMPILE_DEFINITIONS WITH_OXYGEN_ICONS)
+endif()