Install kio slaves consistently to kf5/kio subdir

KDE · Jan 7, 2019 · 04d5b2a · 04d5b2a
1 parent bae70da
commit 04d5b2a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/about/CMakeLists.txt b/about/CMakeLists.txt
@@ -1,20 +1,9 @@
-
-
-
-
-########### next target ###############
-
 set(kio_about_PART_SRCS kio_about.cpp )
 
-
 add_library(kio_about MODULE ${kio_about_PART_SRCS})
 
-
 target_link_libraries(kio_about  KF5::KIOCore Qt5::Network)
+set_target_properties(kio_about PROPERTIES OUTPUT_NAME "about")
 
-install(TARGETS kio_about  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
-
-
-########### install files ###############
-
+install(TARGETS kio_about  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio )
 install( FILES about.protocol  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
diff --git a/about/about.protocol b/about/about.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_about
+exec=kf5/kio/about
 protocol=about
 input=none
 output=filesystem

diff --git a/activities/CMakeLists.txt b/activities/CMakeLists.txt
@@ -35,10 +35,11 @@ target_link_libraries (
    KF5::I18n
    Qt5::Network
    )
+set_target_properties(kio_activities PROPERTIES OUTPUT_NAME "activities")
 
 install (
    TARGETS kio_activities
-   DESTINATION ${KDE_INSTALL_PLUGINDIR}
+   DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio
    )
 
 ########### install files ###############

diff --git a/activities/activities.protocol b/activities/activities.protocol
@@ -1,5 +1,5 @@
 [Protocol]
-exec=kio_activities
+exec=kf5/kio/activities
 protocol=activities
 input=none
 output=filesystem