From a8ec95411a9f618db09050a705fc77ff372094dc Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Tue, 9 Mar 2021 18:19:37 +0200 Subject: [PATCH] KCMs: put the kcm_* libs in builddir/bin/kcms/ This matches the install location scheme QT_PLUGIN_DIR/kcms/, which makes it slightly easier to test stuff right from the builddir, without installation, by exporting QT_PLUGIN_DIR=builddir/bin/. Also install kcm_fontinst in QT_PLUGIN_DIR/kcms/, like the other KCMs. --- kcms/colors/CMakeLists.txt | 1 + kcms/cursortheme/CMakeLists.txt | 1 + kcms/desktoptheme/CMakeLists.txt | 1 + kcms/feedback/CMakeLists.txt | 1 + kcms/fonts/CMakeLists.txt | 1 + kcms/icons/CMakeLists.txt | 1 + kcms/kfontinst/kcmfontinst/CMakeLists.txt | 3 ++- kcms/lookandfeel/CMakeLists.txt | 1 + kcms/style/CMakeLists.txt | 1 + kcms/translations/CMakeLists.txt | 2 +- 10 files changed, 11 insertions(+), 2 deletions(-) diff --git a/kcms/colors/CMakeLists.txt b/kcms/colors/CMakeLists.txt index e71b30e80..4147bbad5 100644 --- a/kcms/colors/CMakeLists.txt +++ b/kcms/colors/CMakeLists.txt @@ -68,6 +68,7 @@ target_link_libraries(plasma-apply-colorscheme install(FILES colorssettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) install(FILES kcm_colors.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +set_target_properties(kcm_colors PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_colors DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(TARGETS plasma-apply-colorscheme DESTINATION ${KDE_INSTALL_BINDIR}) install(FILES colorschemes.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/kcms/cursortheme/CMakeLists.txt b/kcms/cursortheme/CMakeLists.txt index a7b4c3928..a4972f1a4 100644 --- a/kcms/cursortheme/CMakeLists.txt +++ b/kcms/cursortheme/CMakeLists.txt @@ -56,6 +56,7 @@ if (X11_Xfixes_FOUND) target_link_libraries(kcm_cursortheme X11::Xfixes) endif () +set_target_properties(kcm_cursortheme PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_cursortheme DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms ) kcoreaddons_desktop_to_json(kcm_cursortheme "kcm_cursortheme.desktop") diff --git a/kcms/desktoptheme/CMakeLists.txt b/kcms/desktoptheme/CMakeLists.txt index 9f0649055..052ba42e2 100644 --- a/kcms/desktoptheme/CMakeLists.txt +++ b/kcms/desktoptheme/CMakeLists.txt @@ -49,6 +49,7 @@ target_link_libraries(plasma-apply-desktoptheme #this desktop file is installed only for retrocompatibility with sycoca install(FILES kcm_desktoptheme.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) install(FILES plasma-themes.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) +set_target_properties(kcm_desktoptheme PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_desktoptheme DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(TARGETS plasma-apply-desktoptheme DESTINATION ${KDE_INSTALL_BINDIR}) diff --git a/kcms/feedback/CMakeLists.txt b/kcms/feedback/CMakeLists.txt index 7429169a0..7e341a066 100644 --- a/kcms/feedback/CMakeLists.txt +++ b/kcms/feedback/CMakeLists.txt @@ -23,6 +23,7 @@ target_link_libraries(kcm_feedback kcoreaddons_desktop_to_json(kcm_feedback "kcm_feedback.desktop") install(FILES feedbacksettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) +set_target_properties(kcm_feedback PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_feedback DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES kcm_feedback.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) kpackage_install_package(package kcm_feedback kcms) diff --git a/kcms/fonts/CMakeLists.txt b/kcms/fonts/CMakeLists.txt index 3d916003b..754623645 100644 --- a/kcms/fonts/CMakeLists.txt +++ b/kcms/fonts/CMakeLists.txt @@ -33,6 +33,7 @@ kcoreaddons_desktop_to_json(kcm_fonts "kcm_fonts.desktop") ########### install files ############### install(FILES fontssettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) +set_target_properties(kcm_fonts PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_fonts DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES kcm_fonts.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) kpackage_install_package(package kcm_fonts kcms) diff --git a/kcms/icons/CMakeLists.txt b/kcms/icons/CMakeLists.txt index b8251134b..124e6dfaf 100644 --- a/kcms/icons/CMakeLists.txt +++ b/kcms/icons/CMakeLists.txt @@ -40,6 +40,7 @@ kcoreaddons_desktop_to_json(kcm_icons "kcm_icons.desktop") install(FILES iconssettingsbase.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) install(FILES icons_remove_effects.upd DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update) install(FILES kcm_icons.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +set_target_properties(kcm_icons PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_icons DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/icons.knsrc ${CMAKE_BINARY_DIR}/icons.knsrc) diff --git a/kcms/kfontinst/kcmfontinst/CMakeLists.txt b/kcms/kfontinst/kcmfontinst/CMakeLists.txt index d8a4ec247..fca680926 100644 --- a/kcms/kfontinst/kcmfontinst/CMakeLists.txt +++ b/kcms/kfontinst/kcmfontinst/CMakeLists.txt @@ -18,7 +18,8 @@ target_link_libraries(kcm_fontinst X11::X11 ) -install(TARGETS kcm_fontinst DESTINATION ${KDE_INSTALL_PLUGINDIR} ) +set_target_properties(kcm_fontinst PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") +install(TARGETS kcm_fontinst DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install( FILES fontinst.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES kfontinst.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} ) diff --git a/kcms/lookandfeel/CMakeLists.txt b/kcms/lookandfeel/CMakeLists.txt index cdd3b4325..30613c74b 100644 --- a/kcms/lookandfeel/CMakeLists.txt +++ b/kcms/lookandfeel/CMakeLists.txt @@ -72,6 +72,7 @@ kcoreaddons_desktop_to_json(kcm_lookandfeel "kcm_lookandfeel.desktop" SERVICE_TY #this desktop file is installed only for retrocompatibility with sycoca install(FILES lookandfeelsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) install(FILES kcm_lookandfeel.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +set_target_properties(kcm_lookandfeel PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_lookandfeel DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES lookandfeel.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/kcms/style/CMakeLists.txt b/kcms/style/CMakeLists.txt index 1423a486c..9e780ee3c 100644 --- a/kcms/style/CMakeLists.txt +++ b/kcms/style/CMakeLists.txt @@ -48,6 +48,7 @@ install(FILES stylesettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR}) install(FILES style_widgetstyle_default_breeze.upd style_widgetstyle_default_breeze.pl DESTINATION ${KDE_INSTALL_DATADIR}/kconf_update) install(FILES gtk_themes.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) install(FILES kcm_style.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +set_target_properties(kcm_style PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_style DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) kpackage_install_package(package kcm_style kcms) diff --git a/kcms/translations/CMakeLists.txt b/kcms/translations/CMakeLists.txt index 151c4a5e7..18dc881e0 100644 --- a/kcms/translations/CMakeLists.txt +++ b/kcms/translations/CMakeLists.txt @@ -28,7 +28,7 @@ target_link_libraries(kcm_translations kcoreaddons_desktop_to_json(kcm_translations "kcm_translations.desktop") ########### install files ############### - +set_target_properties(kcm_translations PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kcms") install(TARGETS kcm_translations DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES kcm_translations.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) kpackage_install_package(package kcm_translations kcms)