From 2f5e4cb02933e3317098bdf090b3f6103061d4ae Mon Sep 17 00:00:00 2001 From: Alexander Lohnau Date: Thu, 2 Sep 2021 20:11:11 +0200 Subject: Install KCMs in dolphin/kcms namespace This will allow consumers to load the plugin from this namespace without KServiceTypeTrader being involved. --- src/CMakeLists.txt | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 147f18c00..b97a5d7c0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -370,9 +370,12 @@ install(TARGETS dolphin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) if(NOT WIN32) # The settings are still accessible from the hamburger menu - add_library(kcm_dolphinviewmodes MODULE) - add_library(kcm_dolphinnavigation MODULE) - add_library(kcm_dolphingeneral MODULE) + add_library(kcm_dolphinviewmodes) + kcoreaddons_desktop_to_json(kcm_dolphinviewmodes settings/kcm/kcmdolphinviewmodes.desktop) + add_library(kcm_dolphinnavigation) + kcoreaddons_desktop_to_json(kcm_dolphinnavigation settings/kcm/kcmdolphinnavigation.desktop) + add_library(kcm_dolphingeneral) + kcoreaddons_desktop_to_json(kcm_dolphingeneral settings/kcm/kcmdolphingeneral.desktop) target_sources(kcm_dolphinviewmodes PRIVATE settings/kcm/kcmdolphinviewmodes.cpp @@ -420,9 +423,9 @@ if(NOT WIN32) install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) - install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR} ) - install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} ) - install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} ) + install(TARGETS kcm_dolphinviewmodes DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms ) + install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms ) + install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR}/dolphin/kcms ) endif() if(NOT WIN32) -- cgit v1.3.1