diff --git a/CMakeLists.txt b/CMakeLists.txt index f30c958efb..bd65c08ef2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -765,8 +765,8 @@ endif() ########### install files ############### -install(FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}.kcfg) -install(FILES kwin.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR} RENAME ${KWIN_NAME}.notifyrc) +install(FILES kwin.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} RENAME ${KWIN_NAME}.kcfg) +install(FILES kwin.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} RENAME ${KWIN_NAME}.notifyrc) install( FILES org.kde.KWin.VirtualDesktopManager.xml @@ -777,10 +777,10 @@ install( DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR} ) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kwin_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel) # Install the KWin/Script service type -install(FILES scripting/kwinscript.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES scripting/kwinscript.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) add_subdirectory(qml) @@ -806,7 +806,7 @@ kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) include(CMakePackageConfigHelpers) -set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KWinDBusInterface") +set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KWinDBusInterface") configure_package_config_file(KWinDBusInterfaceConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/KWinDBusInterfaceConfig.cmake" PATH_VARS KDE_INSTALL_DBUSINTERFACEDIR diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 2393251a9e..690a113ca1 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(kwin5_update_default_rules Qt::Core Qt::DBus ) -install(TARGETS kwin5_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/) +install(TARGETS kwin5_update_default_rules DESTINATION ${KDE_INSTALL_LIBDIR}/kconf_update_bin/) ########### install files ############### diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt index 6a1b21d2c3..6690f28131 100644 --- a/data/icons/CMakeLists.txt +++ b/data/icons/CMakeLists.txt @@ -5,7 +5,7 @@ ecm_install_icons( 48-apps-kwin.png sc-apps-kwin.svgz DESTINATION - ${ICON_INSTALL_DIR} + ${KDE_INSTALL_ICONDIR} THEME hicolor ) diff --git a/effects/CMakeLists.txt b/effects/CMakeLists.txt index 41a35e668e..de6eec5b0e 100644 --- a/effects/CMakeLists.txt +++ b/effects/CMakeLists.txt @@ -74,7 +74,7 @@ macro(KWIN4_ADD_EFFECT name) endmacro() # Install the KWin/Effect service type -install(FILES kwineffect.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES kwineffect.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) # Create initial variables set(kwin4_effect_include_directories) diff --git a/effects/cube/CMakeLists.txt b/effects/cube/CMakeLists.txt index cd36f98ce6..58b6664897 100644 --- a/effects/cube/CMakeLists.txt +++ b/effects/cube/CMakeLists.txt @@ -2,7 +2,7 @@ # Effect # Data files -install(FILES data/cubecap.png DESTINATION ${DATA_INSTALL_DIR}/kwin) +install(FILES data/cubecap.png DESTINATION ${KDE_INSTALL_DATADIR}/kwin) ####################################### # Config diff --git a/effects/desktopgrid/CMakeLists.txt b/effects/desktopgrid/CMakeLists.txt index 6a9f681ff8..601180d5c4 100644 --- a/effects/desktopgrid/CMakeLists.txt +++ b/effects/desktopgrid/CMakeLists.txt @@ -1,6 +1,6 @@ ####################################### # Effect -install(FILES main.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/effects/desktopgrid/) +install(FILES main.qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/desktopgrid/) ####################################### # Config diff --git a/effects/fade/CMakeLists.txt b/effects/fade/CMakeLists.txt index b84b58bace..034024be4b 100644 --- a/effects/fade/CMakeLists.txt +++ b/effects/fade/CMakeLists.txt @@ -1,8 +1,8 @@ install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_fade) + DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/effects/kwin4_effect_fade) install(FILES package/metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/${KWIN_NAME} RENAME kwin4_effect_fade.desktop) file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_fade) diff --git a/effects/fadedesktop/CMakeLists.txt b/effects/fadedesktop/CMakeLists.txt index 22fe9f9257..f81898941c 100644 --- a/effects/fadedesktop/CMakeLists.txt +++ b/effects/fadedesktop/CMakeLists.txt @@ -1,8 +1,8 @@ install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/effects/kwin4_effect_fadedesktop) + DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/effects/kwin4_effect_fadedesktop) install(FILES package/metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/${KWIN_NAME} RENAME kwin4_effect_fadedesktop.desktop) file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/effects/kwin4_effect_fadedesktop) diff --git a/effects/presentwindows/CMakeLists.txt b/effects/presentwindows/CMakeLists.txt index 7aa23b4b0f..057b33bcbd 100644 --- a/effects/presentwindows/CMakeLists.txt +++ b/effects/presentwindows/CMakeLists.txt @@ -1,6 +1,6 @@ ####################################### # Effect -install(FILES main.qml DESTINATION ${DATA_INSTALL_DIR}/kwin/effects/presentwindows/) +install(FILES main.qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/presentwindows/) ####################################### # Config diff --git a/effects/trackmouse/CMakeLists.txt b/effects/trackmouse/CMakeLists.txt index 38e82f6fe0..14ce40607c 100644 --- a/effects/trackmouse/CMakeLists.txt +++ b/effects/trackmouse/CMakeLists.txt @@ -1,7 +1,7 @@ ####################################### # Effect # Data files -install(FILES data/tm_inner.png data/tm_outer.png DESTINATION ${DATA_INSTALL_DIR}/kwin) +install(FILES data/tm_inner.png data/tm_outer.png DESTINATION ${KDE_INSTALL_DATADIR}/kwin) ####################################### # Config diff --git a/helpers/killer/CMakeLists.txt b/helpers/killer/CMakeLists.txt index 7dec9561c8..d6246a18e5 100644 --- a/helpers/killer/CMakeLists.txt +++ b/helpers/killer/CMakeLists.txt @@ -12,4 +12,4 @@ target_link_libraries(kwin_killer_helper Qt::X11Extras ) -install(TARGETS kwin_killer_helper DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kwin_killer_helper DESTINATION ${KDE_INSTALL_LIBEXECDIR}) diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt index ca868b518f..d02488ddbb 100644 --- a/kcmkwin/kwincompositing/CMakeLists.txt +++ b/kcmkwin/kwincompositing/CMakeLists.txt @@ -34,4 +34,4 @@ target_link_libraries(kwincompositing ) install(TARGETS kwincompositing DESTINATION ${KDE_INSTALL_PLUGINDIR}) -install(FILES kwincompositing.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kwincompositing.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) diff --git a/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt b/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt index ba84468bc7..b0def69a53 100644 --- a/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt +++ b/kcmkwin/kwindecoration/declarative-plugin/CMakeLists.txt @@ -22,5 +22,5 @@ target_link_libraries(kdecorationprivatedeclarative KF5::Service ) -install(TARGETS kdecorationprivatedeclarative DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/private/kdecoration ) -install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/private/kdecoration ) +install(TARGETS kdecorationprivatedeclarative DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/private/kdecoration ) +install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/private/kdecoration ) diff --git a/kcmkwin/kwinoptions/CMakeLists.txt b/kcmkwin/kwinoptions/CMakeLists.txt index 0705fdfb53..a4a940d650 100644 --- a/kcmkwin/kwinoptions/CMakeLists.txt +++ b/kcmkwin/kwinoptions/CMakeLists.txt @@ -35,5 +35,5 @@ install( kwinmoving.desktop kwinoptions.desktop DESTINATION - ${SERVICES_INSTALL_DIR} + ${KDE_INSTALL_KSERVICES5DIR} ) diff --git a/kcmkwin/kwinrules/CMakeLists.txt b/kcmkwin/kwinrules/CMakeLists.txt index 305db8d757..c68f7bdca5 100644 --- a/kcmkwin/kwinrules/CMakeLists.txt +++ b/kcmkwin/kwinrules/CMakeLists.txt @@ -46,12 +46,12 @@ target_link_libraries(KWinRulesObjects ${kcm_libs} ${kwin_kcm_rules_XCB_LIBS}) add_executable(kwin_rules_dialog main.cpp rulesdialog.cpp) target_link_libraries(kwin_rules_dialog KWinRulesObjects) -install(TARGETS kwin_rules_dialog DESTINATION ${LIBEXEC_INSTALL_DIR}) +install(TARGETS kwin_rules_dialog DESTINATION ${KDE_INSTALL_LIBEXECDIR}) 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 ${KDE_INSTALL_PLUGINDIR}/kcms) -install(FILES kcm_kwinrules.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kcm_kwinrules.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) kpackage_install_package(package kcm_kwinrules kcms) diff --git a/kcmkwin/kwinscreenedges/CMakeLists.txt b/kcmkwin/kwinscreenedges/CMakeLists.txt index da70f3d8de..1902924f39 100644 --- a/kcmkwin/kwinscreenedges/CMakeLists.txt +++ b/kcmkwin/kwinscreenedges/CMakeLists.txt @@ -62,4 +62,4 @@ 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 ${KDE_INSTALL_PLUGINDIR}) -install(FILES kwinscreenedges.desktop kwintouchscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kwinscreenedges.desktop kwintouchscreen.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) diff --git a/kcmkwin/kwinscripts/CMakeLists.txt b/kcmkwin/kwinscripts/CMakeLists.txt index a988eedbcc..3e95354553 100644 --- a/kcmkwin/kwinscripts/CMakeLists.txt +++ b/kcmkwin/kwinscripts/CMakeLists.txt @@ -25,5 +25,5 @@ target_link_libraries(kcm_kwin_scripts ) install(TARGETS kcm_kwin_scripts DESTINATION ${KDE_INSTALL_PLUGINDIR}) -install(FILES kwinscripts.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES kwinscripts.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) install(FILES kwinscripts.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/kcmkwin/kwintabbox/CMakeLists.txt b/kcmkwin/kwintabbox/CMakeLists.txt index bd1b118793..af57664e27 100644 --- a/kcmkwin/kwintabbox/CMakeLists.txt +++ b/kcmkwin/kwintabbox/CMakeLists.txt @@ -39,6 +39,6 @@ target_link_libraries(kcm_kwintabbox install(TARGETS kcm_kwintabbox DESTINATION ${KDE_INSTALL_PLUGINDIR} ) ########### install files ############### -install(FILES kwintabbox.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install(FILES thumbnails/konqueror.png thumbnails/kmail.png thumbnails/systemsettings.png thumbnails/dolphin.png DESTINATION ${DATA_INSTALL_DIR}/kwin/kcm_kwintabbox) +install(FILES kwintabbox.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}) +install(FILES thumbnails/konqueror.png thumbnails/kmail.png thumbnails/systemsettings.png thumbnails/dolphin.png DESTINATION ${KDE_INSTALL_DATADIR}/kwin/kcm_kwintabbox) install(FILES kwinswitcher.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR}) diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt index 149e863606..ebf7feb38e 100644 --- a/libkwineffects/CMakeLists.txt +++ b/libkwineffects/CMakeLists.txt @@ -103,7 +103,7 @@ install(FILES kwinglutils.h kwinglutils_funcs.h kwinxrenderutils.h - DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel) + DESTINATION ${KDE_INSTALL_INCLUDEDIR} COMPONENT Devel) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KWinEffects") diff --git a/plugins/kdecorations/aurorae/src/CMakeLists.txt b/plugins/kdecorations/aurorae/src/CMakeLists.txt index 339141b12a..6cd45fc87b 100644 --- a/plugins/kdecorations/aurorae/src/CMakeLists.txt +++ b/plugins/kdecorations/aurorae/src/CMakeLists.txt @@ -41,7 +41,7 @@ target_link_libraries(decorationplugin KF5::ConfigWidgets Qt::Quick ) -install(TARGETS decorationplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decoration) +install(TARGETS decorationplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decoration) ########### install files ############### @@ -57,7 +57,7 @@ install( qml/MenuButton.qml qml/aurorae.qml DESTINATION - ${DATA_INSTALL_DIR}/kwin/aurorae) + ${KDE_INSTALL_DATADIR}/kwin/aurorae) set(QMLFILES qml/AppMenuButton.qml qml/ButtonGroup.qml @@ -66,6 +66,6 @@ set(QMLFILES qml/MenuButton.qml qml/qmldir ) -install(FILES ${QMLFILES} DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decoration) +install(FILES ${QMLFILES} DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decoration) file(COPY ${QMLFILES} DESTINATION ${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decoration/) -install(FILES kwindecoration.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES kwindecoration.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) diff --git a/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt b/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt index 2699d64bcd..f768eeab2c 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt +++ b/plugins/kdecorations/aurorae/themes/plastik/CMakeLists.txt @@ -1,10 +1,10 @@ add_subdirectory(code) install(DIRECTORY package/ - DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/decorations/kwin4_decoration_qml_plastik) + DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/decorations/kwin4_decoration_qml_plastik) install(FILES package/metadata.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/${KWIN_NAME} + DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/${KWIN_NAME} RENAME kwin4_decoration_qml_plastik.desktop) file(COPY package/ DESTINATION ${CMAKE_BINARY_DIR}/bin/kwin/decorations/kwin4_decoration_qml_plastik) diff --git a/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt b/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt index 7956797885..71366d4240 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt +++ b/plugins/kdecorations/aurorae/themes/plastik/code/CMakeLists.txt @@ -6,6 +6,6 @@ set(plastik_plugin_SRCS add_library(plastikplugin SHARED ${plastik_plugin_SRCS}) set_target_properties(plastikplugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decorations/plastik") target_link_libraries(plastikplugin Qt::Core Qt::Quick KF5::ConfigWidgets) -install(TARGETS plastikplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decorations/plastik) -install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kwin/decorations/plastik) +install(TARGETS plastikplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decorations/plastik) +install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kwin/decorations/plastik) file(COPY qmldir DESTINATION ${CMAKE_BINARY_DIR}/bin/org/kde/kwin/decorations/plastik) diff --git a/plugins/nightcolor/CMakeLists.txt b/plugins/nightcolor/CMakeLists.txt index 0910e16806..1e3fee47a9 100644 --- a/plugins/nightcolor/CMakeLists.txt +++ b/plugins/nightcolor/CMakeLists.txt @@ -26,6 +26,6 @@ endif() target_link_libraries(KWinNightColorPlugin kwin) -install(FILES nightcolorsettings.kcfg DESTINATION ${KCFG_INSTALL_DIR} RENAME ${KWIN_NAME}_colorcorrect.kcfg) +install(FILES nightcolorsettings.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} RENAME ${KWIN_NAME}_colorcorrect.kcfg) install(FILES org.kde.kwin.ColorCorrect.xml DESTINATION ${KDE_INSTALL_DBUSINTERFACEDIR}) install(TARGETS KWinNightColorPlugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kwin/plugins/) diff --git a/qml/CMakeLists.txt b/qml/CMakeLists.txt index 1a316c2525..6b8edd828b 100644 --- a/qml/CMakeLists.txt +++ b/qml/CMakeLists.txt @@ -1,3 +1,3 @@ -install(DIRECTORY outline/plasma DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/outline) -install(DIRECTORY onscreennotification/plasma DESTINATION ${DATA_INSTALL_DIR}/${KWIN_NAME}/onscreennotification) +install(DIRECTORY outline/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/outline) +install(DIRECTORY onscreennotification/plasma DESTINATION ${KDE_INSTALL_DATADIR}/${KWIN_NAME}/onscreennotification) diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt index 65d047ee47..5d76a8febd 100644 --- a/scripts/CMakeLists.txt +++ b/scripts/CMakeLists.txt @@ -7,7 +7,7 @@ function(add_kwin_script name) endfunction() # videowall defines a KCModule service that has to be separately installed for the config dialog to be accessible -install(FILES videowall/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME kwin-script-videowall.desktop) +install(FILES videowall/metadata.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME kwin-script-videowall.desktop) add_kwin_script(videowall) add_kwin_script(synchronizeskipswitcher) add_kwin_script(desktopchangeosd) diff --git a/tabbox/CMakeLists.txt b/tabbox/CMakeLists.txt index 74652e107d..9e328c840d 100644 --- a/tabbox/CMakeLists.txt +++ b/tabbox/CMakeLists.txt @@ -1,3 +1,3 @@ # Install the KWin/WindowSwitcher service type -install(FILES kwinwindowswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) -install(FILES kwindesktopswitcher.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) +install(FILES kwinwindowswitcher.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}) +install(FILES kwindesktopswitcher.desktop DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR})