From 61edac18424908c0184d66fc8cfa87f36bb7d470 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Tue, 24 Dec 2019 19:30:44 +0100 Subject: [PATCH] Use non-deprecated install dir variables from ECM --- CMakeLists.txt | 2 +- cmake/DbusInterfaceMacros.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4046051d7b..79c0fefa95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -148,7 +148,7 @@ install(FILES configure_file(org.kde.dolphin.FileManager1.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.dolphin.FileManager1.service - DESTINATION ${DBUS_SERVICES_INSTALL_DIR}) + DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR}) install(FILES dolphin.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/cmake/DbusInterfaceMacros.cmake b/cmake/DbusInterfaceMacros.cmake index 1083dfd443..b5f6a80b0b 100644 --- a/cmake/DbusInterfaceMacros.cmake +++ b/cmake/DbusInterfaceMacros.cmake @@ -9,7 +9,7 @@ macro (generate_and_install_dbus_interface main_project_target header_file outpu ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${output_xml_file} - DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} + DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) add_dependencies( ${main_project_target}