┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorElvis Angelaccio <[email protected]>2020-11-04 01:12:48 +0100
committerElvis Angelaccio <[email protected]>2020-11-04 01:12:48 +0100
commit957cc92f46203f1403a812cbc224123f6b5ed036 (patch)
tree5b190034e60e27328c93a61d7f3156603b78aa5e /CMakeLists.txt
parentc7d4c37534fd4c7107497a3bb67e8ffe96ce775c (diff)
Revert "D-Bus activation systemd service"
This reverts commit eb441b11885fc44dcba1bef693b95819657ed753. We'll push it again after we branch 20.12. We don't want to push a too recent version of KF5 on distros. !27
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt18
1 files changed, 5 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c969465c..c1b1a7b84 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,7 +8,7 @@ set (RELEASE_SERVICE_VERSION "${RELEASE_SERVICE_VERSION_MAJOR}.${RELEASE_SERVICE
project(Dolphin VERSION ${RELEASE_SERVICE_VERSION})
set(QT_MIN_VERSION "5.14.0")
-set(KF5_MIN_VERSION "5.75.0")
+set(KF5_MIN_VERSION "5.73.0")
# ECM setup
find_package(ECM ${KF5_MIN_VERSION} CONFIG REQUIRED)
@@ -16,8 +16,6 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
include(ECMSetupVersion)
include(ECMGenerateHeaders)
-include(ECMGenerateDBusServiceFile)
-include(ECMConfiguredInstall)
include(CMakePackageConfigHelpers)
include(GenerateExportHeader)
include(FeatureSummary)
@@ -157,16 +155,10 @@ install(FILES
COMPONENT Devel
)
-ecm_generate_dbus_service_file(
- NAME org.freedesktop.FileManager1
- EXECUTABLE "${KDE_INSTALL_FULL_BINDIR}/dolphin --daemon"
- SYSTEMD_SERVICE plasma-dolphin.service
- DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}
- RENAME org.kde.dolphin.FileManager1.service
-)
-
-ecm_install_configured_files(INPUT plasma-dolphin.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR})
-
+configure_file(org.kde.dolphin.FileManager1.service.in
+ ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service
+ DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR})
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)