From 88b6076b2f67f9a66f98a650c3fba0d242213f12 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 29 Jan 2021 11:34:52 +0100 Subject: [PATCH] GIT_SILENT: dont use deprecated cmake variable --- CMakeLists.txt | 6 +++--- doc/desktop/CMakeLists.txt | 2 +- doc/kwindecoration/CMakeLists.txt | 2 +- doc/kwineffects/CMakeLists.txt | 2 +- doc/kwinscreenedges/CMakeLists.txt | 2 +- doc/kwintabbox/CMakeLists.txt | 2 +- doc/windowbehaviour/CMakeLists.txt | 2 +- doc/windowspecific/CMakeLists.txt | 2 +- effects/CMakeLists.txt | 2 +- effects/blur/CMakeLists.txt | 2 +- effects/coverswitch/CMakeLists.txt | 2 +- effects/cube/CMakeLists.txt | 2 +- effects/cubeslide/CMakeLists.txt | 2 +- effects/desktopgrid/CMakeLists.txt | 2 +- effects/diminactive/CMakeLists.txt | 2 +- effects/flipswitch/CMakeLists.txt | 2 +- effects/glide/CMakeLists.txt | 2 +- effects/invert/CMakeLists.txt | 2 +- effects/lookingglass/CMakeLists.txt | 2 +- effects/magiclamp/CMakeLists.txt | 2 +- effects/magnifier/CMakeLists.txt | 2 +- effects/mouseclick/CMakeLists.txt | 2 +- effects/mousemark/CMakeLists.txt | 2 +- effects/presentwindows/CMakeLists.txt | 2 +- effects/resize/CMakeLists.txt | 2 +- effects/showfps/CMakeLists.txt | 2 +- effects/showpaint/CMakeLists.txt | 2 +- effects/slide/CMakeLists.txt | 2 +- effects/thumbnailaside/CMakeLists.txt | 2 +- effects/trackmouse/CMakeLists.txt | 2 +- effects/windowgeometry/CMakeLists.txt | 2 +- effects/wobblywindows/CMakeLists.txt | 2 +- effects/zoom/CMakeLists.txt | 2 +- helpers/wayland_wrapper/CMakeLists.txt | 2 +- kcmkwin/common/CMakeLists.txt | 2 +- kcmkwin/kwincompositing/CMakeLists.txt | 2 +- kcmkwin/kwinoptions/CMakeLists.txt | 2 +- kcmkwin/kwinrules/CMakeLists.txt | 2 +- kcmkwin/kwinscreenedges/CMakeLists.txt | 2 +- kcmkwin/kwinscripts/CMakeLists.txt | 2 +- kcmkwin/kwintabbox/CMakeLists.txt | 2 +- libkwineffects/CMakeLists.txt | 6 +++--- plugins/colord-integration/CMakeLists.txt | 2 +- plugins/kdecorations/aurorae/src/CMakeLists.txt | 2 +- plugins/krunner-integration/CMakeLists.txt | 2 +- plugins/nightcolor/CMakeLists.txt | 2 +- plugins/platforms/drm/CMakeLists.txt | 2 +- plugins/platforms/fbdev/CMakeLists.txt | 2 +- plugins/platforms/virtual/CMakeLists.txt | 2 +- plugins/platforms/wayland/CMakeLists.txt | 2 +- plugins/platforms/x11/standalone/CMakeLists.txt | 2 +- plugins/platforms/x11/windowed/CMakeLists.txt | 2 +- plugins/scenes/opengl/CMakeLists.txt | 2 +- plugins/scenes/qpainter/CMakeLists.txt | 2 +- plugins/scenes/xrender/CMakeLists.txt | 2 +- scripting/CMakeLists.txt | 2 +- 56 files changed, 60 insertions(+), 60 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 325400fa57..dffca989de 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -697,8 +697,8 @@ endif() add_executable(kwin_x11 main_x11.cpp) target_link_libraries(kwin_x11 kwin KF5::Crash Qt5::X11Extras) -install(TARGETS kwin ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) -install(TARGETS kwin_x11 ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +install(TARGETS kwin_x11 ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) set(kwin_XWAYLAND_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/xwl/clipboard.cpp @@ -738,7 +738,7 @@ if (HAVE_LIBCAP) target_link_libraries(kwin_wayland ${Libcap_LIBRARIES}) endif() -install(TARGETS kwin_wayland ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwin_wayland ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) if (HAVE_LIBCAP) install( CODE "execute_process( diff --git a/doc/desktop/CMakeLists.txt b/doc/desktop/CMakeLists.txt index b3bc4ec8ac..3a9098121b 100644 --- a/doc/desktop/CMakeLists.txt +++ b/doc/desktop/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/desktop) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/desktop) diff --git a/doc/kwindecoration/CMakeLists.txt b/doc/kwindecoration/CMakeLists.txt index ab41cae4e0..932e9b3973 100644 --- a/doc/kwindecoration/CMakeLists.txt +++ b/doc/kwindecoration/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwindecoration) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwindecoration) diff --git a/doc/kwineffects/CMakeLists.txt b/doc/kwineffects/CMakeLists.txt index 8f01b062a1..265b6ce6c6 100644 --- a/doc/kwineffects/CMakeLists.txt +++ b/doc/kwineffects/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwineffects) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwineffects) diff --git a/doc/kwinscreenedges/CMakeLists.txt b/doc/kwinscreenedges/CMakeLists.txt index d18a816822..b9fb42afef 100644 --- a/doc/kwinscreenedges/CMakeLists.txt +++ b/doc/kwinscreenedges/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwinscreenedges) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwinscreenedges) diff --git a/doc/kwintabbox/CMakeLists.txt b/doc/kwintabbox/CMakeLists.txt index 33d20e1b0a..46313f8a21 100644 --- a/doc/kwintabbox/CMakeLists.txt +++ b/doc/kwintabbox/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kwintabbox) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kwintabbox) diff --git a/doc/windowbehaviour/CMakeLists.txt b/doc/windowbehaviour/CMakeLists.txt index e93dcf9ecc..1f48a01ea8 100644 --- a/doc/windowbehaviour/CMakeLists.txt +++ b/doc/windowbehaviour/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/windowbehaviour) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/windowbehaviour) diff --git a/doc/windowspecific/CMakeLists.txt b/doc/windowspecific/CMakeLists.txt index ad103099a4..732014926b 100644 --- a/doc/windowspecific/CMakeLists.txt +++ b/doc/windowspecific/CMakeLists.txt @@ -1,2 +1,2 @@ ########### install files ############### -kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/windowspecific) +kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/windowspecific) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index ed3e06788c..6b13f991e5 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -70,7 +70,7 @@ macro(KWIN4_ADD_EFFECT name) set_target_properties(kwin4_effect_${name} PROPERTIES VERSION 1.0.0 SOVERSION 1) set_target_properties(kwin4_effect_${name} PROPERTIES OUTPUT_NAME ${KWIN_NAME}4_effect_${name}) - install(TARGETS kwin4_effect_${name} ${INSTALL_TARGETS_DEFAULT_ARGS}) + install(TARGETS kwin4_effect_${name} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) endmacro() # Install the KWin/Effect service type diff --git a/effects/blur/CMakeLists.txt b/effects/blur/CMakeLists.txt index 35db55d5d4..52deb57183 100644 --- a/effects/blur/CMakeLists.txt +++ b/effects/blur/CMakeLists.txt @@ -19,5 +19,5 @@ install( TARGETS kwin_blur_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/coverswitch/CMakeLists.txt b/effects/coverswitch/CMakeLists.txt index f344a0efb1..27169b5834 100644 --- a/effects/coverswitch/CMakeLists.txt +++ b/effects/coverswitch/CMakeLists.txt @@ -22,5 +22,5 @@ install( TARGETS kwin_coverswitch_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt index c9d94605fb..cd36f98ce6 100644 --- a/effects/cube/CMakeLists.txt +++ b/effects/cube/CMakeLists.txt @@ -28,5 +28,5 @@ install( TARGETS kwin_cube_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/cubeslide/CMakeLists.txt b/effects/cubeslide/CMakeLists.txt index 042ae92c01..7275b8c669 100644 --- a/effects/cubeslide/CMakeLists.txt +++ b/effects/cubeslide/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_cubeslide_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/desktopgrid/CMakeLists.txt b/effects/desktopgrid/CMakeLists.txt index 7fa4b7ace2..b4177519ff 100644 --- a/effects/desktopgrid/CMakeLists.txt +++ b/effects/desktopgrid/CMakeLists.txt @@ -27,5 +27,5 @@ install( TARGETS kwin_desktopgrid_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/diminactive/CMakeLists.txt b/effects/diminactive/CMakeLists.txt index 5d6e7d3a18..5ead9e4051 100644 --- a/effects/diminactive/CMakeLists.txt +++ b/effects/diminactive/CMakeLists.txt @@ -19,5 +19,5 @@ install( TARGETS kwin_diminactive_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/flipswitch/CMakeLists.txt b/effects/flipswitch/CMakeLists.txt index 6829ea590c..852e5dc92c 100644 --- a/effects/flipswitch/CMakeLists.txt +++ b/effects/flipswitch/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_flipswitch_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/glide/CMakeLists.txt b/effects/glide/CMakeLists.txt index cd0a69cb43..b2a0aee1eb 100644 --- a/effects/glide/CMakeLists.txt +++ b/effects/glide/CMakeLists.txt @@ -19,6 +19,6 @@ install( TARGETS kwin_glide_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/invert/CMakeLists.txt b/effects/invert/CMakeLists.txt index 09dac3fcfa..ed7dee2127 100644 --- a/effects/invert/CMakeLists.txt +++ b/effects/invert/CMakeLists.txt @@ -21,5 +21,5 @@ install( TARGETS kwin_invert_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/lookingglass/CMakeLists.txt b/effects/lookingglass/CMakeLists.txt index 381a790b19..7c73806b24 100644 --- a/effects/lookingglass/CMakeLists.txt +++ b/effects/lookingglass/CMakeLists.txt @@ -23,5 +23,5 @@ install( TARGETS kwin_lookingglass_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/magiclamp/CMakeLists.txt b/effects/magiclamp/CMakeLists.txt index b1ea9c94ae..a0a6b4a18e 100644 --- a/effects/magiclamp/CMakeLists.txt +++ b/effects/magiclamp/CMakeLists.txt @@ -19,5 +19,5 @@ install( TARGETS kwin_magiclamp_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/magnifier/CMakeLists.txt b/effects/magnifier/CMakeLists.txt index cd3fe05bea..7b22eb6fc5 100644 --- a/effects/magnifier/CMakeLists.txt +++ b/effects/magnifier/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_magnifier_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/mouseclick/CMakeLists.txt b/effects/mouseclick/CMakeLists.txt index 1b1834d621..004d018f45 100644 --- a/effects/mouseclick/CMakeLists.txt +++ b/effects/mouseclick/CMakeLists.txt @@ -21,5 +21,5 @@ install( TARGETS kwin_mouseclick_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/mousemark/CMakeLists.txt b/effects/mousemark/CMakeLists.txt index fd42575f12..965bb865df 100644 --- a/effects/mousemark/CMakeLists.txt +++ b/effects/mousemark/CMakeLists.txt @@ -21,5 +21,5 @@ install( TARGETS kwin_mousemark_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/presentwindows/CMakeLists.txt b/effects/presentwindows/CMakeLists.txt index 9f86c0413d..7aa23b4b0f 100644 --- a/effects/presentwindows/CMakeLists.txt +++ b/effects/presentwindows/CMakeLists.txt @@ -25,5 +25,5 @@ install( TARGETS kwin_presentwindows_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/resize/CMakeLists.txt b/effects/resize/CMakeLists.txt index 5b4393533b..1bdcbe8950 100644 --- a/effects/resize/CMakeLists.txt +++ b/effects/resize/CMakeLists.txt @@ -19,5 +19,5 @@ install( TARGETS kwin_resize_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/showfps/CMakeLists.txt b/effects/showfps/CMakeLists.txt index e217e68fa4..77731ddfe2 100644 --- a/effects/showfps/CMakeLists.txt +++ b/effects/showfps/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_showfps_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/showpaint/CMakeLists.txt b/effects/showpaint/CMakeLists.txt index db12760d7b..3fa7e2d720 100644 --- a/effects/showpaint/CMakeLists.txt +++ b/effects/showpaint/CMakeLists.txt @@ -20,5 +20,5 @@ install( kwin_showpaint_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/slide/CMakeLists.txt b/effects/slide/CMakeLists.txt index a579bb630e..6d604f7335 100644 --- a/effects/slide/CMakeLists.txt +++ b/effects/slide/CMakeLists.txt @@ -19,5 +19,5 @@ install( TARGETS kwin_slide_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/thumbnailaside/CMakeLists.txt b/effects/thumbnailaside/CMakeLists.txt index dacfb2a7e5..de457575eb 100644 --- a/effects/thumbnailaside/CMakeLists.txt +++ b/effects/thumbnailaside/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_thumbnailaside_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/trackmouse/CMakeLists.txt b/effects/trackmouse/CMakeLists.txt index c44223a004..38e82f6fe0 100644 --- a/effects/trackmouse/CMakeLists.txt +++ b/effects/trackmouse/CMakeLists.txt @@ -25,5 +25,5 @@ install( TARGETS kwin_trackmouse_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/windowgeometry/CMakeLists.txt b/effects/windowgeometry/CMakeLists.txt index 4a460425d8..8f4c712ab3 100644 --- a/effects/windowgeometry/CMakeLists.txt +++ b/effects/windowgeometry/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_windowgeometry_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/wobblywindows/CMakeLists.txt b/effects/wobblywindows/CMakeLists.txt index fb2e038e9b..4548991438 100644 --- a/effects/wobblywindows/CMakeLists.txt +++ b/effects/wobblywindows/CMakeLists.txt @@ -19,5 +19,5 @@ install( TARGETS kwin_wobblywindows_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/effects/zoom/CMakeLists.txt b/effects/zoom/CMakeLists.txt index b6b47f241a..8413d1168b 100644 --- a/effects/zoom/CMakeLists.txt +++ b/effects/zoom/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS kwin_zoom_config DESTINATION - ${PLUGIN_INSTALL_DIR}/kwin/effects/configs + ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs ) diff --git a/helpers/wayland_wrapper/CMakeLists.txt b/helpers/wayland_wrapper/CMakeLists.txt index d91c622632..7976e29a7f 100644 --- a/helpers/wayland_wrapper/CMakeLists.txt +++ b/helpers/wayland_wrapper/CMakeLists.txt @@ -1,3 +1,3 @@ add_executable(kwin_wayland_wrapper kwin_wrapper.c wl-socket.c) set_property(TARGET kwin_wayland_wrapper PROPERTY C_STANDARD 11) -install(TARGETS kwin_wayland_wrapper ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwin_wayland_wrapper ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/kcmkwin/common/CMakeLists.txt b/kcmkwin/common/CMakeLists.txt index b41eab6768..33fd97bbb0 100644 --- a/kcmkwin/common/CMakeLists.txt +++ b/kcmkwin/common/CMakeLists.txt @@ -29,4 +29,4 @@ set_target_properties(kcmkwincommon PROPERTIES SOVERSION ${PROJECT_VERSION_MAJOR} ) -install(TARGETS kcmkwincommon ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) +install(TARGETS kcmkwincommon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt index 7278b2eb6f..b50abf7a58 100644 --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kcmkwin/kwincompositing/CMakeLists.txt @@ -33,5 +33,5 @@ target_link_libraries(kwincompositing KF5::KCMUtils ) -install(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kwincompositing DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(FILES kwincompositing.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index 8c45d4f5f6..b9cf215c31 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -23,7 +23,7 @@ kconfig_add_kcfg_files(kcm_kwinoptions_PART_SRCS kwinoptions_kdeglobals_settings qt5_add_dbus_interface(kcm_kwinoptions_PART_SRCS ${KWin_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface) add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS}) target_link_libraries(kcm_kwinoptions kwin Qt5::DBus KF5::Completion KF5::I18n KF5::ConfigWidgets KF5::Service KF5::WindowSystem) -install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kwinoptions DESTINATION ${KDE_INSTALL_PLUGINDIR}) ########### install files ############### diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index dc6e935f21..a1d8d147fa 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -52,6 +52,6 @@ add_library(kcm_kwinrules MODULE kcmrules.cpp rulebookmodel.cpp) target_link_libraries(kcm_kwinrules KWinRulesObjects) kcoreaddons_desktop_to_json(kcm_kwinrules "kcm_kwinrules.desktop" SERVICE_TYPES kcmodule.desktop) -install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR}/kcms) +install(TARGETS kcm_kwinrules DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms) install(FILES kcm_kwinrules.desktop DESTINATION ${SERVICES_INSTALL_DIR}) kpackage_install_package(package kcm_kwinrules kcms) diff --git a/kcmkwin/kwinscreenedges/CMakeLists.txt b/kcmkwin/kwinscreenedges/CMakeLists.txt index 640cc59c03..b40934f9f3 100644 --- a/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/kcmkwin/kwinscreenedges/CMakeLists.txt @@ -61,5 +61,5 @@ kconfig_add_kcfg_files(kcm_kwintouchscreenedges_PART_SRCS kwintouchscreensetting add_library(kcm_kwintouchscreen MODULE ${kcm_kwintouchscreenedges_PART_SRCS}) target_link_libraries(kcm_kwintouchscreen ${X11_LIBRARIES} ${kcm_screenedges_LIBS}) -install(TARGETS kcm_kwinscreenedges kcm_kwintouchscreen DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kwinscreenedges kcm_kwintouchscreen DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(FILES kwinscreenedges.desktop kwintouchscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/kcmkwin/kwinscripts/CMakeLists.txt b/kcmkwin/kwinscripts/CMakeLists.txt index 500e1203ad..9de44eab92 100644 --- a/kcmkwin/kwinscripts/CMakeLists.txt +++ b/kcmkwin/kwinscripts/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries(kcm_kwin_scripts KF5::Package ) -install(TARGETS kcm_kwin_scripts DESTINATION ${PLUGIN_INSTALL_DIR}) +install(TARGETS kcm_kwin_scripts DESTINATION ${KDE_INSTALL_PLUGINDIR}) install(FILES kwinscripts.desktop DESTINATION ${SERVICES_INSTALL_DIR}) install(FILES kwinscripts.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/kcmkwin/kwintabbox/CMakeLists.txt b/kcmkwin/kwintabbox/CMakeLists.txt index 57470e8b59..6194c0d104 100644 --- a/kcmkwin/kwintabbox/CMakeLists.txt +++ b/kcmkwin/kwintabbox/CMakeLists.txt @@ -36,7 +36,7 @@ target_link_libraries(kcm_kwintabbox kwin4_effect_builtins ) -install(TARGETS kcm_kwintabbox DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kcm_kwintabbox DESTINATION ${KDE_INSTALL_PLUGINDIR} ) ########### install files ############### install(FILES kwintabbox.desktop DESTINATION ${SERVICES_INSTALL_DIR}) diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt index b49aebbfad..028268d783 100644 --- a/libkwineffects/CMakeLists.txt +++ b/libkwineffects/CMakeLists.txt @@ -32,7 +32,7 @@ set_target_properties(kwinxrenderutils PROPERTIES ) set_target_properties(kwinxrenderutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}xrenderutils) -install(TARGETS kwinxrenderutils EXPORT KWinEffectsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwinxrenderutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) ### effects lib ### set(kwin_EFFECTSLIB_SRCS @@ -66,7 +66,7 @@ set_target_properties(kwineffects PROPERTIES ) set_target_properties(kwineffects PROPERTIES OUTPUT_NAME ${KWIN_NAME}effects) -install(TARGETS kwineffects EXPORT KWinEffectsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwineffects EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) # kwingl(es)utils library set(kwin_GLUTILSLIB_SRCS @@ -87,7 +87,7 @@ set_target_properties(kwinglutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glutils ) -install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) +install(TARGETS kwinglutils EXPORT KWinEffectsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h diff --git a/plugins/colord-integration/CMakeLists.txt b/plugins/colord-integration/CMakeLists.txt index 2f7daf3d30..5b979cf87b 100644 --- a/plugins/colord-integration/CMakeLists.txt +++ b/plugins/colord-integration/CMakeLists.txt @@ -34,4 +34,4 @@ qt5_add_dbus_interface(colordintegration_SOURCES ${COLORD_PROFILE_XML} colordpro add_library(colordintegration MODULE ${colordintegration_SOURCES}) set_target_properties(colordintegration PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/kwin/plugins/") target_link_libraries(colordintegration kwin) -install(TARGETS colordintegration DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/plugins/) +install(TARGETS colordintegration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/) diff --git a/plugins/kdecorations/aurorae/src/CMakeLists.txt b/plugins/kdecorations/aurorae/src/CMakeLists.txt index cd6c0ac91a..1a8af6e65e 100644 --- a/plugins/kdecorations/aurorae/src/CMakeLists.txt +++ b/plugins/kdecorations/aurorae/src/CMakeLists.txt @@ -26,7 +26,7 @@ target_link_libraries(kwin5_aurorae Qt5::UiTools ) -install(TARGETS kwin5_aurorae DESTINATION ${PLUGIN_INSTALL_DIR}/org.kde.kdecoration2) +install(TARGETS kwin5_aurorae DESTINATION ${KDE_INSTALL_PLUGINDIR}/org.kde.kdecoration2) set(decoration_plugin_SRCS colorhelper.cpp diff --git a/plugins/krunner-integration/CMakeLists.txt b/plugins/krunner-integration/CMakeLists.txt index 5ec2182433..b4ce71d7a8 100644 --- a/plugins/krunner-integration/CMakeLists.txt +++ b/plugins/krunner-integration/CMakeLists.txt @@ -8,5 +8,5 @@ qt5_add_dbus_adaptor(krunnerintegration_SOURCES org.kde.krunner1.xml windowsrunn add_library(krunnerintegration MODULE ${krunnerintegration_SOURCES}) target_link_libraries(krunnerintegration kwin KF5::Runner) -install(TARGETS krunnerintegration DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/plugins/) +install(TARGETS krunnerintegration DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/) install(FILES kwin-runner-windows.desktop DESTINATION ${KDE_INSTALL_DATAROOTDIR}/krunner/dbusplugins) diff --git a/plugins/nightcolor/CMakeLists.txt b/plugins/nightcolor/CMakeLists.txt index c517f8d5e5..0910e16806 100644 --- a/plugins/nightcolor/CMakeLists.txt +++ b/plugins/nightcolor/CMakeLists.txt @@ -28,4 +28,4 @@ target_link_libraries(KWinNightColorPlugin kwin) install(FILES nightcolorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}_colorcorrect.kcfg) install(FILES org.kde.kwin.ColorCorrect.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) -install(TARGETS KWinNightColorPlugin DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/plugins/) +install(TARGETS KWinNightColorPlugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/) diff --git a/plugins/platforms/drm/CMakeLists.txt b/plugins/platforms/drm/CMakeLists.txt index de687aa030..b10ae4b551 100644 --- a/plugins/platforms/drm/CMakeLists.txt +++ b/plugins/platforms/drm/CMakeLists.txt @@ -42,5 +42,5 @@ install( TARGETS KWinWaylandDrmBackend DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/ ) diff --git a/plugins/platforms/fbdev/CMakeLists.txt b/plugins/platforms/fbdev/CMakeLists.txt index 2391eb24cc..ab5dbde612 100644 --- a/plugins/platforms/fbdev/CMakeLists.txt +++ b/plugins/platforms/fbdev/CMakeLists.txt @@ -13,5 +13,5 @@ install( TARGETS KWinWaylandFbdevBackend DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/ ) diff --git a/plugins/platforms/virtual/CMakeLists.txt b/plugins/platforms/virtual/CMakeLists.txt index cfe96f71d0..5d2e3932c2 100644 --- a/plugins/platforms/virtual/CMakeLists.txt +++ b/plugins/platforms/virtual/CMakeLists.txt @@ -16,5 +16,5 @@ install( TARGETS KWinWaylandVirtualBackend DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/ ) diff --git a/plugins/platforms/wayland/CMakeLists.txt b/plugins/platforms/wayland/CMakeLists.txt index 2412686d20..d00909ae55 100644 --- a/plugins/platforms/wayland/CMakeLists.txt +++ b/plugins/platforms/wayland/CMakeLists.txt @@ -27,5 +27,5 @@ install( TARGETS KWinWaylandWaylandBackend DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/ ) diff --git a/plugins/platforms/x11/standalone/CMakeLists.txt b/plugins/platforms/x11/standalone/CMakeLists.txt index 4fd9ee8e51..c18cf86d33 100644 --- a/plugins/platforms/x11/standalone/CMakeLists.txt +++ b/plugins/platforms/x11/standalone/CMakeLists.txt @@ -43,5 +43,5 @@ install( TARGETS KWinX11Platform DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.platforms/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.platforms/ ) diff --git a/plugins/platforms/x11/windowed/CMakeLists.txt b/plugins/platforms/x11/windowed/CMakeLists.txt index 3b4e92b5fa..59ed811b73 100644 --- a/plugins/platforms/x11/windowed/CMakeLists.txt +++ b/plugins/platforms/x11/windowed/CMakeLists.txt @@ -17,5 +17,5 @@ install( TARGETS KWinWaylandX11Backend DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.waylandbackends/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.waylandbackends/ ) diff --git a/plugins/scenes/opengl/CMakeLists.txt b/plugins/scenes/opengl/CMakeLists.txt index 19e85f78c1..6f6da5f219 100644 --- a/plugins/scenes/opengl/CMakeLists.txt +++ b/plugins/scenes/opengl/CMakeLists.txt @@ -28,5 +28,5 @@ install( TARGETS KWinSceneOpenGL DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.scenes/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.scenes/ ) diff --git a/plugins/scenes/qpainter/CMakeLists.txt b/plugins/scenes/qpainter/CMakeLists.txt index 24f0d9c546..5b14390925 100644 --- a/plugins/scenes/qpainter/CMakeLists.txt +++ b/plugins/scenes/qpainter/CMakeLists.txt @@ -11,5 +11,5 @@ install( TARGETS KWinSceneQPainter DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.scenes/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.scenes/ ) diff --git a/plugins/scenes/xrender/CMakeLists.txt b/plugins/scenes/xrender/CMakeLists.txt index 6cf94ce5d1..15a4439228 100644 --- a/plugins/scenes/xrender/CMakeLists.txt +++ b/plugins/scenes/xrender/CMakeLists.txt @@ -20,5 +20,5 @@ install( TARGETS KWinSceneXRender DESTINATION - ${PLUGIN_INSTALL_DIR}/org.kde.kwin.scenes/ + ${KDE_INSTALL_PLUGINDIR}/org.kde.kwin.scenes/ ) diff --git a/scripting/CMakeLists.txt b/scripting/CMakeLists.txt index ca101bf25f..c1d4521580 100644 --- a/scripting/CMakeLists.txt +++ b/scripting/CMakeLists.txt @@ -8,4 +8,4 @@ target_link_libraries(kcm_kwin4_genericscripted Qt5::DBus Qt5::UiTools ) -install(TARGETS kcm_kwin4_genericscripted DESTINATION ${PLUGIN_INSTALL_DIR}/kwin/effects/configs) +install(TARGETS kcm_kwin4_genericscripted DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/effects/configs)