From 35716d82c21212d2a19fa2771525deeb2e802872 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 27 Sep 2022 14:20:51 +0300 Subject: [PATCH] generic: make use of the dbus_add_activation_service() macro Signed-off-by: Ivailo Monev --- kcontrol/kfontinst/dbus/CMakeLists.txt | 16 +++++++++++----- ...service.cmake => org.kde.fontinst.service.in} | 0 kglobalaccel/org.kde.kglobalaccel.service.in | 2 +- knotify/CMakeLists.txt | 10 +++++----- knotify/org.kde.knotify.service.cmake | 3 --- knotify/org.kde.knotify.service.in | 3 +++ krunner/dbus/org.kde.krunner.service.in | 2 +- kuiserver/org.kde.kuiserver.service.in | 2 +- 8 files changed, 22 insertions(+), 16 deletions(-) rename kcontrol/kfontinst/dbus/{org.kde.fontinst.service.cmake => org.kde.fontinst.service.in} (100%) delete mode 100644 knotify/org.kde.knotify.service.cmake create mode 100644 knotify/org.kde.knotify.service.in diff --git a/kcontrol/kfontinst/dbus/CMakeLists.txt b/kcontrol/kfontinst/dbus/CMakeLists.txt index 0c14d86a..768dafe0 100644 --- a/kcontrol/kfontinst/dbus/CMakeLists.txt +++ b/kcontrol/kfontinst/dbus/CMakeLists.txt @@ -1,8 +1,15 @@ -include_directories(${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kcontrol/fonts) +include_directories( + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + ${KDE4_INCLUDES} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/kcontrol/fonts +) add_definitions(${QT_DEFINITIONS}) +# for dbus_add_activation_service +include(MacroDBusAddActivationService) + set(fontinst_bin_SRCS FcConfig.cpp FontInst.cpp Folder.cpp Main.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} ) set(fontinst_helper_SRCS FcConfig.cpp Helper.cpp Folder.cpp Utils.cpp ${libkfontinstdbusiface_SRCS} ) @@ -25,7 +32,6 @@ install(TARGETS fontinst_bin DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) install(TARGETS fontinst_helper DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR} ) install(PROGRAMS fontinst_x11 DESTINATION ${KDE4_LIBEXEC_INSTALL_DIR}) -configure_file(org.kde.fontinst.service.cmake ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/session/org.kde.fontinst.service DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR} ) +dbus_add_activation_service(org.kde.fontinst.service.in) kde4_install_auth_helper_files(fontinst_helper org.kde.fontinst root) diff --git a/kcontrol/kfontinst/dbus/org.kde.fontinst.service.cmake b/kcontrol/kfontinst/dbus/org.kde.fontinst.service.in similarity index 100% rename from kcontrol/kfontinst/dbus/org.kde.fontinst.service.cmake rename to kcontrol/kfontinst/dbus/org.kde.fontinst.service.in diff --git a/kglobalaccel/org.kde.kglobalaccel.service.in b/kglobalaccel/org.kde.kglobalaccel.service.in index 1c2b13aa..11211377 100644 --- a/kglobalaccel/org.kde.kglobalaccel.service.in +++ b/kglobalaccel/org.kde.kglobalaccel.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.kde.kglobalaccel -Exec=@CMAKE_INSTALL_PREFIX@/bin/kglobalaccel \ No newline at end of file +Exec=@KDE4_BIN_INSTALL_DIR@/kglobalaccel \ No newline at end of file diff --git a/knotify/CMakeLists.txt b/knotify/CMakeLists.txt index ed00db44..bc6ee698 100644 --- a/knotify/CMakeLists.txt +++ b/knotify/CMakeLists.txt @@ -1,4 +1,8 @@ +# for dbus_add_activation_service +include(MacroDBusAddActivationService) + add_subdirectory( sounds ) + ########### next target ############### set(knotify_SRCS @@ -51,8 +55,4 @@ install( FILES ${knotifyplugin_HEADERS} DESTINATION ${KDE4_INCLUDE_INSTALL_DIR} ########### D-Bus Autostart Services ######### - -configure_file(org.kde.knotify.service.cmake - ${CMAKE_CURRENT_BINARY_DIR}/org.kde.knotify.service) - -install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.knotify.service DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR} ) +dbus_add_activation_service(org.kde.knotify.service.in) diff --git a/knotify/org.kde.knotify.service.cmake b/knotify/org.kde.knotify.service.cmake deleted file mode 100644 index 4e802356..00000000 --- a/knotify/org.kde.knotify.service.cmake +++ /dev/null @@ -1,3 +0,0 @@ -[D-BUS Service] -Name=org.kde.knotify -Exec=@CMAKE_INSTALL_PREFIX@/bin/knotify4 diff --git a/knotify/org.kde.knotify.service.in b/knotify/org.kde.knotify.service.in new file mode 100644 index 00000000..91bd037d --- /dev/null +++ b/knotify/org.kde.knotify.service.in @@ -0,0 +1,3 @@ +[D-BUS Service] +Name=org.kde.knotify +Exec=@KDE4_BIN_INSTALL_DIR@/knotify4 diff --git a/krunner/dbus/org.kde.krunner.service.in b/krunner/dbus/org.kde.krunner.service.in index 85715214..7e08d05d 100644 --- a/krunner/dbus/org.kde.krunner.service.in +++ b/krunner/dbus/org.kde.krunner.service.in @@ -1,4 +1,4 @@ [D-BUS Service] Name=org.kde.krunner -Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner +Exec=@KDE4_BIN_INSTALL_DIR@/krunner diff --git a/kuiserver/org.kde.kuiserver.service.in b/kuiserver/org.kde.kuiserver.service.in index a900b646..f7df1e39 100644 --- a/kuiserver/org.kde.kuiserver.service.in +++ b/kuiserver/org.kde.kuiserver.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.kde.kuiserver -Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver \ No newline at end of file +Exec=@KDE4_BIN_INSTALL_DIR@/kuiserver \ No newline at end of file