From ea9b5d7adefee3223491710604166ac130db14c4 Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Tue, 27 Sep 2022 14:47:34 +0300
Subject: [PATCH] cmake: new baseline kde4_add_dbus_service() macro replacing
 dbus_add_activation_service()

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 cmake/modules/CMakeLists.txt                  |  1 -
 cmake/modules/KDE4Macros.cmake                | 21 ++++++++++++++++++-
 .../MacroDBusAddActivationService.cmake       |  9 --------
 cmake/modules/MacroLibrary.cmake              |  1 -
 kded/CMakeLists.txt                           |  4 +---
 5 files changed, 21 insertions(+), 15 deletions(-)
 delete mode 100644 cmake/modules/MacroDBusAddActivationService.cmake

diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt
index d7b18180..0340bb02 100644
--- a/cmake/modules/CMakeLists.txt
+++ b/cmake/modules/CMakeLists.txt
@@ -70,7 +70,6 @@ set(cmakeFiles
     KDE4Defaults.cmake
     KDE4Macros.cmake
     MacroBoolTo01.cmake
-    MacroDBusAddActivationService.cmake
     MacroLibrary.cmake
     MacroOptionalAddSubdirectory.cmake
     MacroOptionalFindPackage.cmake
diff --git a/cmake/modules/KDE4Macros.cmake b/cmake/modules/KDE4Macros.cmake
index b682d541..72e19288 100644
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
@@ -233,7 +233,7 @@ endmacro(KDE4_ADD_WIDGET)
 #  KDE4_INSTALL_AUTH_HELPER_FILES ( HELPER_TARGET HELPER_ID HELPER_USER )
 #   This macro adds the needed files for an helper executable meant to be used
 #   by applications using KAuth. It accepts the helper target, the helper ID
-#   (the DBUS name) and the user under which the helper will run on.
+#   (the D-Bus name) and the user under which the helper will run on.
 #
 #   *WARNING* You have to install the helper in ${KDE4_LIBEXEC_INSTALL_DIR} to
 #             make sure everything will work.
@@ -262,3 +262,22 @@ function(KDE4_INSTALL_AUTH_HELPER_FILES HELPER_TARGET HELPER_ID HELPER_USER)
         DESTINATION ${KDE4_DBUS_SYSTEM_SERVICES_INSTALL_DIR}
     )
 endfunction(KDE4_INSTALL_AUTH_HELPER_FILES)
+
+#  KDE4_ADD_DBUS_SERVICE (file1 ... fileN)
+#    Use this to add D-Bus service activation file(s). The input file(s) must
+#    be ".service.in" suffixed
+macro(KDE4_ADD_DBUS_SERVICE _sources)
+    foreach(_current_FILE ${_sources})
+        get_filename_component(_input ${_current_FILE} ABSOLUTE)
+        get_filename_component(_basename ${_input} NAME)
+        string(REPLACE ".service.in" ".service" _output_file ${_basename})
+        configure_file(
+            ${_input}
+            ${CMAKE_CURRENT_BINARY_DIR}/${_output_file}
+        )
+        install(
+            FILES ${CMAKE_CURRENT_BINARY_DIR}/${_output_file}
+            DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR}
+        )
+    endforeach()
+endmacro(KDE4_ADD_DBUS_SERVICE)
diff --git a/cmake/modules/MacroDBusAddActivationService.cmake b/cmake/modules/MacroDBusAddActivationService.cmake
deleted file mode 100644
index c8a0677c..00000000
--- a/cmake/modules/MacroDBusAddActivationService.cmake
+++ /dev/null
@@ -1,9 +0,0 @@
-macro(dbus_add_activation_service _sources)
-    foreach (_i ${_sources})
-        get_filename_component(_service_file ${_i} ABSOLUTE)
-        string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})
-        set(_target ${CMAKE_CURRENT_BINARY_DIR}/${_output_file})
-        configure_file(${_service_file} ${_target} @ONLY)
-        install(FILES ${_target} DESTINATION ${KDE4_DBUS_SERVICES_INSTALL_DIR})
-    endforeach (_i ${ARGN})
-endmacro(dbus_add_activation_service _sources) 
diff --git a/cmake/modules/MacroLibrary.cmake b/cmake/modules/MacroLibrary.cmake
index 6faebded..dccfce5a 100644
--- a/cmake/modules/MacroLibrary.cmake
+++ b/cmake/modules/MacroLibrary.cmake
@@ -9,4 +9,3 @@ INCLUDE(MacroOptionalFindPackage)
 INCLUDE(MacroOptionalAddSubdirectory)
 INCLUDE(MacroAddFileDependencies)
 INCLUDE(MacroBoolTo01)
-INCLUDE(MacroDBusAddActivationService)
diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index 21a73ce1..7b5a95d0 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -37,7 +37,7 @@ install(
     DESTINATION ${KDE4_DBUS_INTERFACES_INSTALL_DIR}
 )
 
-dbus_add_activation_service(org.kde.kded.service.in)
+kde4_add_dbus_service(org.kde.kded.service.in)
 
 ########### next target ###############
 
@@ -80,5 +80,3 @@ install(
     kdedmodule.desktop
     DESTINATION ${KDE4_SERVICETYPES_INSTALL_DIR}
 )
-
-