wilderjds
/
plasma-workspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

KCMs: put the kcm_* libs in builddir/bin/kcms/

Browse Source 
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.
wilder-5.22
Ahmad Samir 5 years ago
parent aa840a9d08
commit a8ec95411a
10 changed files with 11 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      kcms/colors/CMakeLists.txt
  2. 1
      kcms/cursortheme/CMakeLists.txt
  3. 1
      kcms/desktoptheme/CMakeLists.txt
  4. 1
      kcms/feedback/CMakeLists.txt
  5. 1
      kcms/fonts/CMakeLists.txt
  6. 1
      kcms/icons/CMakeLists.txt
  7. 3
      kcms/kfontinst/kcmfontinst/CMakeLists.txt
  8. 1
      kcms/lookandfeel/CMakeLists.txt
  9. 1
      kcms/style/CMakeLists.txt
  10. 2
      kcms/translations/CMakeLists.txt

1
kcms/colors/CMakeLists.txt
Unescape View File

@ -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})

1
kcms/cursortheme/CMakeLists.txt
Unescape View File

@ -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")

1
kcms/desktoptheme/CMakeLists.txt
Unescape View File

@ -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})

1
kcms/feedback/CMakeLists.txt
Unescape View File

@ -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)

1
kcms/fonts/CMakeLists.txt
Unescape View File

@ -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)

1
kcms/icons/CMakeLists.txt
Unescape View File

@ -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)

3
kcms/kfontinst/kcmfontinst/CMakeLists.txt
Unescape View File

@ -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} )

1
kcms/lookandfeel/CMakeLists.txt
Unescape View File

@ -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})

1
kcms/style/CMakeLists.txt
Unescape View File

@ -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)

2
kcms/translations/CMakeLists.txt
Unescape View File

@ -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)

Write Preview
Loading…
Cancel
Save