From 1a8032610353a592831863774e6e1abc4b6f5189 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 2 Jun 2014 17:34:46 +0100 Subject: [PATCH] Move kded module to kf5/kded subdirectory This makes sure the module is properly versioned. REVIEW: 118476 --- src/platformstatus/CMakeLists.txt | 5 ++++- src/platformstatus/kded_platformstatus.desktop | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/platformstatus/CMakeLists.txt b/src/platformstatus/CMakeLists.txt index 676a8be30..6ff2375c4 100644 --- a/src/platformstatus/CMakeLists.txt +++ b/src/platformstatus/CMakeLists.txt @@ -10,6 +10,9 @@ qt5_add_dbus_adaptor ( ) add_library(kded_platformstatus MODULE ${kded_platformstatus_SRCS} ) +set_target_properties(kded_platformstatus PROPERTIES + OUTPUT_NAME platformstatus +) target_link_libraries( kded_platformstatus @@ -22,7 +25,7 @@ target_link_libraries( Qt5::Quick ) -install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR} ) +install( TARGETS kded_platformstatus DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kded ) install( FILES kded_platformstatus.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) install( FILES org.kde.platformstatus.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} ) diff --git a/src/platformstatus/kded_platformstatus.desktop b/src/platformstatus/kded_platformstatus.desktop index 9976fa304..5053954e4 100644 --- a/src/platformstatus/kded_platformstatus.desktop +++ b/src/platformstatus/kded_platformstatus.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Service X-KDE-ServiceTypes=KDEDModule -X-KDE-Library=platformstatus +X-KDE-Library=kf5/kded/platformstatus X-KDE-DBus-ModuleName=plaformstatus X-KDE-Kded-autoload=true X-KDE-Kded-load-on-demand=false