generic: make use of the dbus_add_activation_service() macro

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2022-09-27 14:20:51 +03:00
parent 624185ad90
commit 35716d82c2
8 changed files with 22 additions and 16 deletions

View file

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

View file

@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.kde.kglobalaccel
Exec=@CMAKE_INSTALL_PREFIX@/bin/kglobalaccel
Exec=@KDE4_BIN_INSTALL_DIR@/kglobalaccel

View file

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

View file

@ -1,3 +0,0 @@
[D-BUS Service]
Name=org.kde.knotify
Exec=@CMAKE_INSTALL_PREFIX@/bin/knotify4

View file

@ -0,0 +1,3 @@
[D-BUS Service]
Name=org.kde.knotify
Exec=@KDE4_BIN_INSTALL_DIR@/knotify4

View file

@ -1,4 +1,4 @@
[D-BUS Service]
Name=org.kde.krunner
Exec=@CMAKE_INSTALL_PREFIX@/bin/krunner
Exec=@KDE4_BIN_INSTALL_DIR@/krunner

View file

@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.kde.kuiserver
Exec=@CMAKE_INSTALL_PREFIX@/bin/kuiserver
Exec=@KDE4_BIN_INSTALL_DIR@/kuiserver