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 2f11c33535a6871c074c0d0289bf962cd8921153..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(
@@ -201,6 +203,7 @@ target_link_libraries(
     Qt6::DBus
     Qt6::Gui
     KF6::I18n
+    KF6::GuiAddons
     KF6::IconThemes
     KF6::KIOCore
     KF6::KIOWidgets
@@ -274,6 +277,7 @@ target_sources(dolphinstatic PRIVATE
     dolphincontextmenu.cpp
     dolphinnavigatorswidgetaction.cpp
     dolphintabbar.cpp
+    dolphinpackageinstaller.cpp
     dolphinplacesmodelsingleton.cpp
     dolphinrecenttabsmenu.cpp
     dolphintabpage.cpp
@@ -334,6 +338,7 @@ target_sources(dolphinstatic PRIVATE
     dolphincontextmenu.h
     dolphinnavigatorswidgetaction.h
     dolphintabbar.h
+    dolphinpackageinstaller.h
     dolphinplacesmodelsingleton.h
     dolphinrecenttabsmenu.h
     dolphintabpage.h
@@ -445,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
@@ -452,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()
 
@@ -520,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