Merge remote-tracking branch 'origin/Applications/19.04'

[dolphin.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5aff4b0fadcac1912962e20146ce6532cce7b1e7..e0dd576793b54b22f1192a14fe1dd68074ad487b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,7 +2,9 @@ include(ECMAddAppIcon)
 
 configure_file(config-baloo.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-baloo.h)
 
-configure_file(config-dolphin.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-dolphin.h)
+configure_file(config-kactivities.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kactivities.h)
+
+configure_file(config-terminal.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-terminal.h)
 
 add_definitions(
     -DTRANSLATION_DOMAIN=\"dolphin\"
@@ -106,9 +108,10 @@ set(dolphinprivate_LIB_SRCS
     dolphinremoveaction.cpp
     middleclickactioneventfilter.cpp
     dolphinnewfilemenu.cpp
-    dolphindebug.cpp
 )
 
+ecm_qt_declare_logging_category(dolphinprivate_LIB_SRCS HEADER dolphindebug.h IDENTIFIER DolphinDebug CATEGORY_NAME org.kde.dolphin)
+
 if(HAVE_BALOO)
     set(dolphinprivate_LIB_SRCS
         ${dolphinprivate_LIB_SRCS}
@@ -135,7 +138,6 @@ target_link_libraries(
     dolphinvcs
     Qt5::Concurrent
     Qt5::Gui
-    KF5::Crash
     KF5::I18n
     KF5::IconThemes
     KF5::KIOCore
@@ -201,7 +203,6 @@ set(dolphinstatic_SRCS
     filterbar/filterbar.cpp
     panels/places/placespanel.cpp
     panels/places/placesitem.cpp
-    panels/places/placesitemeditdialog.cpp
     panels/places/placesitemlistgroupheader.cpp
     panels/places/placesitemlistwidget.cpp
     panels/places/placesitemmodel.cpp
@@ -278,7 +279,7 @@ target_link_libraries(dolphinstatic
     Phonon::phonon4qt5
 )
 
-if (KF5Activities_FOUND)
+if (HAVE_KACTIVITIES)
     target_link_libraries(
         dolphinstatic
         KF5::Activities
@@ -300,6 +301,7 @@ kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
 target_link_libraries(kdeinit_dolphin PRIVATE
     dolphinstatic
     dolphinprivate
+    KF5::Crash
 )
 
 include(DbusInterfaceMacros)