diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,7 @@ include(ECMQueryQmake) include(KDEPackageAppTemplates) include(KDEClangFormat) +include(ECMConfiguredInstall) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Plasma DocTools Runner NotifyConfig Su NewStuff Wallet diff --git a/krunner/CMakeLists.txt b/krunner/CMakeLists.txt --- a/krunner/CMakeLists.txt +++ b/krunner/CMakeLists.txt @@ -5,11 +5,8 @@ set(krunner_dbusAppXML dbus/org.kde.krunner.App.xml) qt5_add_dbus_adaptor(krunner_SRCS ${krunner_dbusAppXML} view.h View) -configure_file(dbus/org.kde.krunner.service.in - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krunner.service) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.krunner.service - DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) +ecm_install_configured_files(TEMPLATES dbus/org.kde.krunner.service.in DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) add_executable(krunner ${krunner_SRCS}) @@ -30,8 +27,7 @@ install(TARGETS krunner ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${krunner_dbusAppXML} DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) -configure_file(krunner.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/krunner.desktop DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel) +ecm_install_configured_files(TEMPLATES krunner.desktop.cmake DESTINATION ${DATA_INSTALL_DIR}/kglobalaccel @ONLY) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KRunnerAppDBusInterface") configure_package_config_file(KRunnerAppDBusInterfaceConfig.cmake.in diff --git a/login-sessions/CMakeLists.txt b/login-sessions/CMakeLists.txt --- a/login-sessions/CMakeLists.txt +++ b/login-sessions/CMakeLists.txt @@ -1,14 +1,10 @@ ## For Plasma end users -configure_file(plasma.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma.desktop) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/plasma.desktop +ecm_install_configured_files(TEMPLATES plasma.desktop.cmake DESTINATION ${KDE_INSTALL_DATADIR}/xsessions ) -configure_file(plasmawayland.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasmawayland.desktop) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/plasmawayland.desktop +ecm_install_configured_files(TEMPLATES plasmawayland.desktop.cmake DESTINATION ${KDE_INSTALL_DATADIR}/wayland-sessions ) diff --git a/runners/baloo/CMakeLists.txt b/runners/baloo/CMakeLists.txt --- a/runners/baloo/CMakeLists.txt +++ b/runners/baloo/CMakeLists.txt @@ -15,9 +15,7 @@ Qt5::DBus ) -configure_file(org.kde.baloorunner.service.in - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.baloorunner.service) - +kdbusaddons_generate_dbus_service_file(baloorunner org.kde.baloorunner @CMAKE_INSTALL_FULL_LIBEXECDIR@) install( TARGETS baloorunner @@ -28,6 +26,3 @@ FILES plasma-runner-baloosearch.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.baloorunner.service - DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) diff --git a/runners/baloo/org.kde.baloorunner.service.in b/runners/baloo/org.kde.baloorunner.service.in deleted file mode 100644 --- a/runners/baloo/org.kde.baloorunner.service.in +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.kde.runners.baloo -Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/baloorunner diff --git a/shell/CMakeLists.txt b/shell/CMakeLists.txt --- a/shell/CMakeLists.txt +++ b/shell/CMakeLists.txt @@ -85,11 +85,13 @@ target_link_libraries(plasmashell Qt5::X11Extras) endif() -configure_file(org.kde.plasmashell.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop @ONLY) +ecm_install_configured_files(TEMPLATES org.kde.plasmashell.desktop.cmake DESTINATION + ${KDE_INSTALL_APPDIR}) +# DAVE this would make the same temporary file twice... would that be a real world issue ? +ecm_install_configured_files(TEMPLATES org.kde.plasmashell.desktop.cmake DESTINATION + ${KDE_INSTALL_AUTOSTARTDIR}) install(TARGETS plasmashell ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.plasmashell.desktop DESTINATION ${KDE_INSTALL_APPDIR}) -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} ) install(FILES diff --git a/wallpapers/image/CMakeLists.txt b/wallpapers/image/CMakeLists.txt --- a/wallpapers/image/CMakeLists.txt +++ b/wallpapers/image/CMakeLists.txt @@ -36,8 +36,7 @@ install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/wallpapers/image) -configure_file(wallpaper.knsrc.cmake ${CMAKE_CURRENT_BINARY_DIR}/wallpaper.knsrc) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/wallpaper.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +ecm_install_configured_files(TEMPLATES wallpaper.knsrc.cmake DESTINATION ${KDE_INSTALL_KNSRCDIR}) plasma_install_package(imagepackage org.kde.image wallpapers wallpaper) plasma_install_package(slideshowpackage org.kde.slideshow wallpapers wallpaper)