Use not deprecated SYSTEMD_USER_UNIT_INSTALL_DIR

wilder-5.25
Laurent Montel 4 years ago
parent 033d005d62
commit e294f6ab08
  1. 2
      gmenu-dbusmenu-proxy/CMakeLists.txt
  2. 2
      krunner/CMakeLists.txt
  3. 4
      ksmserver/CMakeLists.txt
  4. 2
      ksplash/ksplashqml/CMakeLists.txt
  5. 2
      runners/baloo/CMakeLists.txt
  6. 2
      shell/CMakeLists.txt
  7. 2
      startkde/kcminit/CMakeLists.txt
  8. 6
      startkde/systemd/CMakeLists.txt
  9. 2
      xembed-sni-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})

@ -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)

@ -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})

@ -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})

@ -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})

@ -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

@ -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)

@ -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)

@ -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})

Loading…
Cancel
Save