]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Use non-deprecated install dir variables from ECM
authorElvis Angelaccio <elvis.angelaccio@kde.org>
Tue, 24 Dec 2019 18:30:44 +0000 (19:30 +0100)
committerElvis Angelaccio <elvis.angelaccio@kde.org>
Tue, 24 Dec 2019 18:30:44 +0000 (19:30 +0100)
CMakeLists.txt
cmake/DbusInterfaceMacros.cmake

index 4046051d7b23b644ff241605310ccee9a1502fab..79c0fefa95a5f44f749b77d7f87cd92917be629f 100644 (file)
@@ -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)
index 1083dfd443aa93090b478728ab09535d100b10ac..b5f6a80b0b6f0a3fd417eda9ff280ed13c259268 100644 (file)
@@ -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}