Merge remote-tracking branch 'upstream/master' into work/zakharafoniam/useful-groups

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ab288a563e880d8d11245c133abaabadf90397dd..ce5b5461319dbb3c7792d0944f12cbecd470441d 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,7 @@
 include(ECMAddAppIcon)
 
+set(ADMIN_WORKER_PACKAGE_NAME "kio-admin")
+set(FILELIGHT_PACKAGE_NAME "filelight")
 configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
 
 add_definitions(
@@ -189,6 +191,7 @@ kconfig_add_kcfg_files(dolphinprivate
     settings/dolphin_generalsettings.kcfgc
     settings/dolphin_contextmenusettings.kcfgc
     settings/dolphin_versioncontrolsettings.kcfgc
+    GENERATE_MOC
 )
 
 generate_export_header(dolphinprivate BASE_NAME dolphin)
@@ -197,8 +200,10 @@ target_link_libraries(
     dolphinprivate PUBLIC
     dolphinvcs
     Qt6::Concurrent
+    Qt6::DBus
     Qt6::Gui
     KF6::I18n
+    KF6::GuiAddons
     KF6::IconThemes
     KF6::KIOCore
     KF6::KIOWidgets
@@ -261,6 +266,8 @@ install(FILES dolphinpartactions.desktop DESTINATION "${KDE_INSTALL_DATADIR}/dol
 add_library(dolphinstatic STATIC)
 
 target_sources(dolphinstatic PRIVATE
+    admin/bar.cpp
+    admin/workerintegration.cpp
     animatedheightwidget.cpp
     disabledactionnotifier.cpp
     dolphinbookmarkhandler.cpp
@@ -270,6 +277,7 @@ target_sources(dolphinstatic PRIVATE
     dolphincontextmenu.cpp
     dolphinnavigatorswidgetaction.cpp
     dolphintabbar.cpp
+    dolphinpackageinstaller.cpp
     dolphinplacesmodelsingleton.cpp
     dolphinrecenttabsmenu.cpp
     dolphintabpage.cpp
@@ -320,6 +328,8 @@ target_sources(dolphinstatic PRIVATE
     global.cpp
     dolphin.qrc
 
+    admin/bar.h
+    admin/workerintegration.h
     animatedheightwidget.h
     dolphinbookmarkhandler.h
     dolphindockwidget.h
@@ -328,6 +338,7 @@ target_sources(dolphinstatic PRIVATE
     dolphincontextmenu.h
     dolphinnavigatorswidgetaction.h
     dolphintabbar.h
+    dolphinpackageinstaller.h
     dolphinplacesmodelsingleton.h
     dolphinrecenttabsmenu.h
     dolphintabpage.h
@@ -439,6 +450,7 @@ target_include_directories(dolphinstatic SYSTEM PRIVATE ${PHONON_INCLUDES})
 target_link_libraries(dolphinstatic
     dolphinprivate
     KF6::CoreAddons
+    KF6::GuiAddons
     KF6::KCMUtils
     KF6::DBusAddons
     KF6::Notifications
@@ -446,10 +458,10 @@ target_link_libraries(dolphinstatic
     Phonon::phonon4qt6
 )
 
-if (HAVE_PLASMA_ACTIVITIES)
+if(HAVE_PACKAGEKIT)
     target_link_libraries(
         dolphinstatic
-        Plasma::Activities
+        PK::packagekitqt6
     )
 endif()
 
@@ -482,10 +494,6 @@ ecm_add_app_icon(dolphin
         icons/32-apps-org.kde.dolphin.png
         icons/48-apps-org.kde.dolphin.png
         icons/64-apps-org.kde.dolphin.png
-    DESTINATION
-        ${KDE_INSTALL_ICONDIR}
-    THEME
-        hicolor
 )
 
 install(FILES icons/org.kde.dolphin.svg DESTINATION ${KDE_INSTALL_ICONDIR}/hicolor/scalable/apps)
@@ -518,6 +526,7 @@ if(NOT WIN32)
     # The settings are still accessible from the hamburger menu
     add_library(kcm_dolphinviewmodes MODULE)
     add_library(kcm_dolphingeneral MODULE)
+    target_compile_definitions(kcm_dolphingeneral PUBLIC IS_KCM)
 
     target_sources(kcm_dolphinviewmodes PRIVATE
         settings/kcm/kcmdolphinviewmodes.cpp
@@ -569,10 +578,13 @@ if(NOT WIN32)
         settings/dolphin_contentdisplaysettings.kcfgc
         settings/dolphin_generalsettings.kcfgc
         settings/dolphin_versioncontrolsettings.kcfgc
+        GENERATE_MOC
     )
 
     kconfig_add_kcfg_files(kcm_dolphingeneral
-        settings/dolphin_generalsettings.kcfgc)
+        settings/dolphin_generalsettings.kcfgc
+        GENERATE_MOC
+    )
 
     target_link_libraries(kcm_dolphinviewmodes dolphinprivate)
     target_link_libraries(kcm_dolphingeneral dolphinprivate)
@@ -616,3 +628,15 @@ install( FILES settings/dolphin_detailsmodesettings.upd
 if(BUILD_TESTING)
     add_subdirectory(tests)
 endif()
+
+# movetonewfolderitemaction plugin
+
+kcoreaddons_add_plugin(movetonewfolderitemaction
+    SOURCES itemactions/movetonewfolderitemaction.cpp itemactions/movetonewfolderitemaction.h
+    INSTALL_NAMESPACE "kf6/kfileitemaction")
+
+target_link_libraries(movetonewfolderitemaction
+    KF6::I18n
+    KF6::KIOCore
+    KF6::KIOWidgets
+    KF6::KIOFileWidgets)