From e294f6ab083e2e51464b3710e9449e7aec615ce7 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 18 Jan 2022 07:22:30 +0100 Subject: [PATCH] Use not deprecated SYSTEMD_USER_UNIT_INSTALL_DIR --- gmenu-dbusmenu-proxy/CMakeLists.txt | 2 +- krunner/CMakeLists.txt | 2 +- ksmserver/CMakeLists.txt | 4 ++-- ksplash/ksplashqml/CMakeLists.txt | 2 +- runners/baloo/CMakeLists.txt | 2 +- shell/CMakeLists.txt | 2 +- startkde/kcminit/CMakeLists.txt | 2 +- startkde/systemd/CMakeLists.txt | 6 +++--- xembed-sni-proxy/CMakeLists.txt | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gmenu-dbusmenu-proxy/CMakeLists.txt b/gmenu-dbusmenu-proxy/CMakeLists.txt index 695a9c764..02996b143 100644 --- a/gmenu-dbusmenu-proxy/CMakeLists.txt +++ b/gmenu-dbusmenu-proxy/CMakeLists.txt @@ -46,4 +46,4 @@ target_link_libraries(gmenudbusmenuproxy install(TARGETS gmenudbusmenuproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES gmenudbusmenuproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) -ecm_install_configured_files(INPUT plasma-gmenudbusmenuproxy.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) +ecm_install_configured_files(INPUT plasma-gmenudbusmenuproxy.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt index 16abe9da3..fa2b5789f 100644 --- a/krunner/CMakeLists.txt +++ b/krunner/CMakeLists.txt @@ -43,6 +43,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KRunnerAppDBusInterfaceConfig.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) ecm_install_configured_files(INPUT plasma-krunner.service.in @ONLY DESTINATION - ${SYSTEMD_USER_UNIT_INSTALL_DIR}) + ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) add_subdirectory(update) diff --git a/ksmserver/CMakeLists.txt b/ksmserver/CMakeLists.txt index 06ba89bc3..8a07730b5 100644 --- a/ksmserver/CMakeLists.txt +++ b/ksmserver/CMakeLists.txt @@ -69,5 +69,5 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KSMServerDBusInterfaceConfig.cmake install( FILES org.kde.KSMServerInterface.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) -ecm_install_configured_files(INPUT plasma-ksmserver.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) -ecm_install_configured_files(INPUT plasma-restoresession.service.in DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) +ecm_install_configured_files(INPUT plasma-ksmserver.service.in DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) +ecm_install_configured_files(INPUT plasma-restoresession.service.in DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) diff --git a/ksplash/ksplashqml/CMakeLists.txt b/ksplash/ksplashqml/CMakeLists.txt index 624ecac82..8ae6d72bd 100644 --- a/ksplash/ksplashqml/CMakeLists.txt +++ b/ksplash/ksplashqml/CMakeLists.txt @@ -23,4 +23,4 @@ target_link_libraries(ksplashqml install(TARGETS ksplashqml ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES org.kde.KSplash.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) -ecm_install_configured_files(INPUT plasma-ksplash.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) +ecm_install_configured_files(INPUT plasma-ksplash.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) diff --git a/runners/baloo/CMakeLists.txt b/runners/baloo/CMakeLists.txt index d8f0ccc2e..64e080a5e 100644 --- a/runners/baloo/CMakeLists.txt +++ b/runners/baloo/CMakeLists.txt @@ -32,4 +32,4 @@ ecm_generate_dbus_service_file(NAME org.kde.runners.baloo DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) ecm_install_configured_files(INPUT plasma-baloorunner.service.in @ONLY DESTINATION - ${SYSTEMD_USER_UNIT_INSTALL_DIR}) + ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt index 94eec8706..7ba8f7344 100644 --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -107,7 +107,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATIO install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) install( FILES dbus/org.kde.PlasmaShell.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) -ecm_install_configured_files(INPUT plasma-plasmashell.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) +ecm_install_configured_files(INPUT plasma-plasmashell.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) install(FILES scripting/plasma-layouttemplate.desktop diff --git a/startkde/kcminit/CMakeLists.txt b/startkde/kcminit/CMakeLists.txt index 4c5d28cab..da9dae49f 100644 --- a/startkde/kcminit/CMakeLists.txt +++ b/startkde/kcminit/CMakeLists.txt @@ -17,7 +17,7 @@ set(kcminit_startup_SRCS main.cpp) add_executable(kcminit_startup ${kcminit_startup_SRCS}) ecm_install_configured_files(INPUT plasma-kcminit-phase1.service.in plasma-kcminit.service.in - DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) + DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) target_link_libraries(kcminit_startup Qt::Core Qt::Gui Qt::DBus KF5::CoreAddons KF5::Service KF5::I18n PW::KWorkspace) diff --git a/startkde/systemd/CMakeLists.txt b/startkde/systemd/CMakeLists.txt index 4ec86f62b..89480801f 100644 --- a/startkde/systemd/CMakeLists.txt +++ b/startkde/systemd/CMakeLists.txt @@ -1,8 +1,8 @@ ecm_install_configured_files(INPUT plasma-ksplash-ready.service.in @ONLY - DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) + DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) -install(FILES plasma-core.target DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) -install(FILES plasma-workspace@.target DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) +install(FILES plasma-core.target DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) +install(FILES plasma-workspace@.target DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR}) add_executable(kde-systemd-start-condition kde-systemd-start-condition.cpp) target_link_libraries(kde-systemd-start-condition PUBLIC KF5::ConfigCore KF5::Service PlasmaAutostart) diff --git a/xembed-sni-proxy/CMakeLists.txt b/xembed-sni-proxy/CMakeLists.txt index bbdfbe910..bcc583bfa 100644 --- a/xembed-sni-proxy/CMakeLists.txt +++ b/xembed-sni-proxy/CMakeLists.txt @@ -63,4 +63,4 @@ target_link_libraries(xembedsniproxy install(TARGETS xembedsniproxy ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES xembedsniproxy.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR}) -ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${SYSTEMD_USER_UNIT_INSTALL_DIR}) +ecm_install_configured_files(INPUT plasma-xembedsniproxy.service.in @ONLY DESTINATION ${KDE_INSTALL_SYSTEMDUSERUNITDIR})