Merge pull request #6137 from tintou/tintou/pkgconfig-define-variables

libcloudproviders: Use DEFINE_VARIABLES to install in the correct directory
nextcloud · Mar 20, 2024 · 23c812e · 23c812e
2 parents baa19e4 + 6e1e8a8
commit 23c812e
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/shell_integration/libcloudproviders/CMakeLists.txt b/shell_integration/libcloudproviders/CMakeLists.txt
@@ -1,5 +1,9 @@
 macro(dbus_add_activation_service _sources)
+if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.28.0") 
+    pkg_get_variable(_install_dir dbus-1 session_bus_services_dir DEFINE_VARIABLES datadir=${CMAKE_INSTALL_DATADIR})
+else()
     pkg_get_variable(_install_dir dbus-1 session_bus_services_dir)
+endif()
     foreach (_i ${_sources})
         get_filename_component(_service_file ${_i} ABSOLUTE)
         string(REGEX REPLACE "\\.service.*$" ".service" _output_file ${_i})