Use non-deprecated KDEInstallDirs variables

applets/kicker/CMakeLists.txt

@@ -54,7 +54,7 @@ ecm_qt_declare_logging_category(kickerplugin_SRCS
 qt5_add_dbus_interface(kickerplugin_SRCS ${KRUNNERAPP_INTERFACE} krunner_interface)
 qt5_add_dbus_interface(kickerplugin_SRCS ${KSMSERVER_DBUS_INTERFACE} ksmserver_interface)
 
-install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kicker)
+install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kicker)
 
 add_library(kickerplugin SHARED ${kickerplugin_SRCS})
 
@@ -86,4 +86,4 @@ if (${HAVE_APPSTREAMQT})
 target_link_libraries(kickerplugin AppStreamQt)
 endif()
 
-install(TARGETS kickerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kicker)
+install(TARGETS kickerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kicker)

applets/kimpanel/CMakeLists.txt

@@ -9,8 +9,8 @@ set(kimpanelplugin_SRCS
     plugin/kimpanelplugin.cpp
 )
 
-install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kimpanel)
+install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kimpanel)
 add_library(kimpanelplugin SHARED ${kimpanelplugin_SRCS})
 
 target_link_libraries(kimpanelplugin Qt5::Gui Qt5::Qml)
-install(TARGETS kimpanelplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/kimpanel)
+install(TARGETS kimpanelplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/kimpanel)

applets/kimpanel/backend/ibus/CMakeLists.txt

@@ -46,7 +46,7 @@ if(IBUS_FOUND AND GLIB2_FOUND AND GIO_FOUND AND GOBJECT_FOUND)
         set_target_properties(kimpanel-ibus-panel-launcher PROPERTIES AUTOMOC TRUE)
         target_link_libraries(kimpanel-ibus-panel-launcher Qt5::Core Qt5::DBus)
         target_include_directories(kimpanel-ibus-panel-launcher PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
-        install(TARGETS kimpanel-ibus-panel kimpanel-ibus-panel-launcher DESTINATION ${LIBEXEC_INSTALL_DIR})
+        install(TARGETS kimpanel-ibus-panel kimpanel-ibus-panel-launcher DESTINATION ${KDE_INSTALL_LIBEXECDIR})
     endif()
 endif()
 

applets/kimpanel/backend/ibus/kimpanel.xml.in

@@ -3,7 +3,7 @@
 <component>
         <name>org.freedesktop.IBus.Panel</name>
         <description>KDE IM Panel Component</description>
-        <exec>@LIBEXEC_INSTALL_DIR@/kimpanel-ibus-panel</exec>
+        <exec>@KDE_INSTALL_LIBEXECDIR@/kimpanel-ibus-panel</exec>
         <version>1.5.8</version>
         <author>Weng Xuetian &lt;wengxt@gmail.com&gt;</author>
         <license>GPL</license>

applets/kimpanel/backend/scim/CMakeLists.txt

@@ -7,5 +7,5 @@ if(SCIM_FOUND)
     add_executable(kimpanel-scim-panel ${kimpanel_scim_panel_SRCS})
     set_target_properties(kimpanel-scim-panel PROPERTIES AUTOMOC TRUE)
     target_link_libraries(kimpanel-scim-panel Qt5::Core Qt5::DBus ${SCIM_LIBRARIES})
-    install(TARGETS kimpanel-scim-panel DESTINATION ${LIBEXEC_INSTALL_DIR})
+    install(TARGETS kimpanel-scim-panel DESTINATION ${KDE_INSTALL_LIBEXECDIR})
 endif(SCIM_FOUND)

applets/pager/CMakeLists.txt

@@ -25,5 +25,5 @@ if (X11_FOUND)
     target_link_libraries(pagerplugin Qt5::X11Extras)
 endif()
 
-install(TARGETS pagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/pager)
-install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/pager)
+install(TARGETS pagerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/pager)
+install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/pager)

applets/taskmanager/CMakeLists.txt

@@ -11,7 +11,7 @@ set(taskmanagerplugin_SRCS
     plugin/smartlaunchers/smartlauncheritem.cpp
 )
 
-install(FILES plugin/qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/taskmanager)
+install(FILES plugin/qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/taskmanager)
 
 add_library(taskmanagerplugin SHARED ${taskmanagerplugin_SRCS})
 
@@ -31,4 +31,4 @@ target_link_libraries(taskmanagerplugin
                       KF5::Service
                       KF5::WindowSystem)
 
-install(TARGETS taskmanagerplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/taskmanager)
+install(TARGETS taskmanagerplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/taskmanager)

applets/trash/plugin/CMakeLists.txt

@@ -14,6 +14,6 @@ target_link_libraries(trashplugin
         KF5::GuiAddons
         )
 
-install(TARGETS trashplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/trash)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/trash)
+install(TARGETS trashplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/trash)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/private/trash)
 

attica-kde/kdeplugin/CMakeLists.txt

@@ -9,5 +9,5 @@ ecm_qt_declare_logging_category(SRCS
 add_library(attica_kde MODULE kdeplatformdependent.cpp ${SRCS})
 target_link_libraries(attica_kde KF5::KIOWidgets Qt5::Widgets KF5::KCMUtils KF5::Attica KF5::Wallet KF5::I18n )
 
-install(TARGETS attica_kde DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS attica_kde DESTINATION ${KDE_INSTALL_PLUGINDIR})
 

config-workspace.h.cmake

@@ -126,13 +126,13 @@
 #cmakedefine KDE_DEFAULT_HOME "${KDE_DEFAULT_HOME}"
 
 /* KDE's binaries directory */
-#define KDE_BINDIR "${BIN_INSTALL_DIR}"
+#define KDE_BINDIR "${KDE_INSTALL_BINDIR}"
 
 /* KDE's configuration directory */
-#define KDE_CONFDIR "${CONFIG_INSTALL_DIR}"
+#define KDE_CONFDIR "${KDE_INSTALL_CONFDIR}"
 
 /* KDE's static data directory */
-#define KDE_DATADIR "${DATA_INSTALL_DIR}"
+#define KDE_DATADIR "${KDE_INSTALL_DATADIR}"
 
 /* Define where your java executable is */
 #undef PATH_JAVA

containments/desktop/plugins/desktop/CMakeLists.txt

@@ -3,7 +3,7 @@ set(desktopplugin_SRCS
     infonotification.cpp
 )
 
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/desktop)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/desktop)
 
 add_library(desktopplugin SHARED ${desktopplugin_SRCS})
 
@@ -14,4 +14,4 @@ target_link_libraries(desktopplugin
                       Qt5::Widgets
                       KF5::Notifications)
 
-install(TARGETS desktopplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/desktop)
+install(TARGETS desktopplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/desktop)

containments/desktop/plugins/folder/CMakeLists.txt

@@ -23,7 +23,7 @@ set(folderplugin_SRCS
     screenmapper.cpp
 )
 
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/folder)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/folder)
 
 add_library(folderplugin SHARED ${folderplugin_SRCS})
 
@@ -38,7 +38,7 @@ target_link_libraries(folderplugin
                       KF5::PlasmaQuick
                       KF5::ConfigGui)
 
-install(TARGETS folderplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/private/desktopcontainment/folder)
+install(TARGETS folderplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/private/desktopcontainment/folder)
 
 generate_export_header(folderplugin BASE_NAME folderplugin)
 

dataengines/kimpanel/CMakeLists.txt

@@ -27,9 +27,9 @@ target_link_libraries(plasma_engine_kimpanel
 kcoreaddons_desktop_to_json(plasma_engine_kimpanel plasma-dataengine-kimpanel.desktop)
 
 install(TARGETS plasma_engine_kimpanel
-        DESTINATION ${PLUGIN_INSTALL_DIR}/plasma/dataengine)
+        DESTINATION ${KDE_INSTALL_PLUGINDIR}/plasma/dataengine)
 
 install(FILES plasma-dataengine-kimpanel.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR})
+        DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 
 install(FILES kimpanel.operations DESTINATION ${PLASMA_DATA_INSTALL_DIR}/services)

doc/kcontrol/autostart/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/autostart)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/autostart)

doc/kcontrol/baloo/CMakeLists.txt

 kdoctools_create_handbook(index.docbook
-                          INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en
+                          INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en
                           SUBDIR kcontrol/baloo)

doc/kcontrol/clock/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/clock)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/clock)

doc/kcontrol/colors/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/colors)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/colors)

doc/kcontrol/componentchooser/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/componentchooser)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/componentchooser)

doc/kcontrol/cursortheme/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/cursortheme)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/cursortheme)

doc/kcontrol/desktopthemedetails/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/desktopthemedetails)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/desktopthemedetails)

doc/kcontrol/emoticons/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/emoticons)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/emoticons)

doc/kcontrol/fontinst/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/fontinst)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/fontinst)

doc/kcontrol/fonts/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/fonts)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/fonts)

doc/kcontrol/formats/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/formats)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/formats)

doc/kcontrol/icons/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/icons)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/icons)

doc/kcontrol/joystick/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/joystick)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/joystick)

doc/kcontrol/kcmaccess/CMakeLists.txt

 ########### install files ###############
 #
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcmaccess)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcmaccess)

doc/kcontrol/kcmlaunch/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcmlaunch)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcmlaunch)

doc/kcontrol/kcmnotify/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcmnotify)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcmnotify)

doc/kcontrol/kcmsmserver/CMakeLists.txt

 ########### install files ###############
 #KDE_LANG  = en
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcmsmserver)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcmsmserver)

doc/kcontrol/kcmstyle/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kcmstyle)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kcmstyle)

doc/kcontrol/kded/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/kded)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/kded)

doc/kcontrol/keyboard/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/keyboard)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/keyboard)

doc/kcontrol/keys/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/keys)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/keys)

doc/kcontrol/mouse/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/mouse)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/mouse)

doc/kcontrol/paths/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/paths)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/paths)

doc/kcontrol/phonon/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/phonon)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/phonon)

doc/kcontrol/solid-actions/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/solid-actions)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/solid-actions)

doc/kcontrol/solid-device-automounter/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/solid-device-automounter)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/solid-device-automounter)

doc/kcontrol/spellchecking/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/spellchecking)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/spellchecking)

doc/kcontrol/splashscreen/CMakeLists.txt

 ########### install files ###############
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/splashscreen)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/splashscreen)

doc/kcontrol/translations/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kcontrol/translations)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kcontrol/translations)

doc/kfontview/CMakeLists.txt

-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kfontview)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kfontview)

doc/knetattach/CMakeLists.txt

 ########### install files ###############
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR knetattach)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR knetattach)

doc/plasma-desktop/CMakeLists.txt

 ########### install files ###############
 #
 #
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR plasma-desktop)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR plasma-desktop)
 

imports/activitymanager/CMakeLists.txt

@@ -52,7 +52,7 @@ target_link_libraries (
 ## install
 
 install (TARGETS activityswitcherextensionplugin
-         DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/activityswitcher)
+         DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/activityswitcher)
 install (FILES qmldir
-         DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/activityswitcher)
+         DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/plasma/activityswitcher)
 

kaccess/CMakeLists.txt

@@ -25,10 +25,10 @@ target_link_libraries(kdeinit_kaccess
     ${X11_LIBRARIES}
 )
 
-install(TARGETS kdeinit_kaccess ${INSTALL_TARGETS_DEFAULT_ARGS} )
-install(TARGETS kaccess         ${INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kdeinit_kaccess ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
+install(TARGETS kaccess         ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} )
 
 ########### install files ###############
 
-install( FILES kaccess.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES kaccess.notifyrc  DESTINATION  ${KNOTIFYRC_INSTALL_DIR} )
+install( FILES kaccess.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES kaccess.notifyrc  DESTINATION  ${KDE_INSTALL_KNOTIFY5RCDIR} )

kcms/access/CMakeLists.txt

@@ -22,8 +22,8 @@ target_link_libraries(kcm_access
     ${X11_LIBRARIES}
 )
 
-install(TARGETS kcm_access DESTINATION ${PLUGIN_INSTALL_DIR})
+install(TARGETS kcm_access DESTINATION ${KDE_INSTALL_PLUGINDIR})
 
 ########### install files ###############
 
-install( FILES kcmaccess.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES kcmaccess.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

kcms/autostart/CMakeLists.txt

@@ -16,5 +16,5 @@ target_link_libraries(kcm_autostart KF5::KCMUtils KF5::I18n KF5::KIOCore KF5::KI
 
 ########### install files ###############
 
-install(TARGETS kcm_autostart  DESTINATION ${PLUGIN_INSTALL_DIR} )
-install( FILES autostart.desktop   DESTINATION  ${SERVICES_INSTALL_DIR} )
+install(TARGETS kcm_autostart  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
+install( FILES autostart.desktop   DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

kcms/baloo/CMakeLists.txt

@@ -25,5 +25,5 @@ target_link_libraries(kcm_baloofile
 )
 
 
-install(FILES kcm_baloofile.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(TARGETS kcm_baloofile DESTINATION ${PLUGIN_INSTALL_DIR})
+install(FILES kcm_baloofile.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(TARGETS kcm_baloofile DESTINATION ${KDE_INSTALL_PLUGINDIR})

kcms/colors/CMakeLists.txt

@@ -41,8 +41,8 @@ target_link_libraries(kcolorschemeeditor
 if(X11_FOUND)
     target_link_libraries(kcolorschemeeditor ${X11_LIBRARIES} Qt5::X11Extras)
 endif()
-install(TARGETS kcolorschemeeditor  DESTINATION ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES org.kde.kcolorschemeeditor.desktop  DESTINATION  ${XDG_APPS_INSTALL_DIR})
+install(TARGETS kcolorschemeeditor  DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES org.kde.kcolorschemeeditor.desktop  DESTINATION  ${KDE_INSTALL_APPDIR})
 
 # ----------------
 
@@ -84,10 +84,10 @@ if(X11_FOUND)
     target_link_libraries(kcm_colors ${X11_LIBRARIES} Qt5::X11Extras)
 endif()
 
-install(TARGETS kcm_colors  DESTINATION ${PLUGIN_INSTALL_DIR})
-install( FILES colors.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES colorschemes.knsrc DESTINATION  ${CONFIG_INSTALL_DIR} )
+install(TARGETS kcm_colors  DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install( FILES colors.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES colorschemes.knsrc DESTINATION  ${KDE_INSTALL_CONFDIR} )
 
 # built-in color schemes
 file(GLOB schemefiles schemes/*.colors)
-install( FILES ${schemefiles} DESTINATION ${DATA_INSTALL_DIR}/color-schemes )
+install( FILES ${schemefiles} DESTINATION ${KDE_INSTALL_DATADIR}/color-schemes )

kcms/componentchooser/CMakeLists.txt

@@ -35,10 +35,10 @@ target_link_libraries(kcm_componentchooser
                       Qt5::X11Extras
                       )
 
-install(TARGETS kcm_componentchooser  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_componentchooser  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
-install( FILES componentchooser.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES componentchooser.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 

kcms/componentchooser/componentservices/CMakeLists.txt

-install( FILES kcm_kemail.desktop kcm_browser.desktop kcm_filemanager.desktop DESTINATION  ${DATA_INSTALL_DIR}/kcm_componentchooser )
-install( FILES kcm_terminal.desktop DESTINATION  ${DATA_INSTALL_DIR}/kcm_componentchooser)
+install( FILES kcm_kemail.desktop kcm_browser.desktop kcm_filemanager.desktop DESTINATION  ${KDE_INSTALL_DATADIR}/kcm_componentchooser )
+install( FILES kcm_terminal.desktop DESTINATION  ${KDE_INSTALL_DATADIR}/kcm_componentchooser)

kcms/cursortheme/CMakeLists.txt

@@ -50,14 +50,14 @@ if (X11_Xfixes_FOUND)
    target_link_libraries(kcm_cursortheme ${X11_Xfixes_LIB})
 endif ()
 
-install(TARGETS kcm_cursortheme  DESTINATION ${PLUGIN_INSTALL_DIR}/kcms )
+install(TARGETS kcm_cursortheme  DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms )
 
 kcoreaddons_desktop_to_json(kcm_cursortheme "kcm_cursortheme.desktop")
 
 ########### install files ###############
 
-install( FILES kcm_cursortheme.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES xcursor/xcursor.knsrc DESTINATION  ${CONFIG_INSTALL_DIR} )
+install( FILES kcm_cursortheme.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES xcursor/xcursor.knsrc DESTINATION  ${KDE_INSTALL_CONFDIR} )
 
 kpackage_install_package(package kcm_cursortheme kcms)
 

kcms/dateandtime/CMakeLists.txt

@@ -22,7 +22,7 @@ target_link_libraries(kcm_clock
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_clock  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_clock  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 ########### next target ###############
 #This is only needed when not using timedated and can be removed in future
@@ -37,4 +37,4 @@ kauth_install_actions(org.kde.kcontrol.kcmclock kcmclock_actions.actions)
 
 ########### install files ###############
 
-install( FILES clock.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES clock.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

kcms/desktoppaths/CMakeLists.txt

@@ -15,6 +15,6 @@ target_link_libraries(kcm_desktoppaths
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_desktoppaths DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES desktoppath.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS kcm_desktoppaths DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(FILES desktoppath.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
 

kcms/desktoptheme/CMakeLists.txt

@@ -20,8 +20,8 @@ target_link_libraries(kcm_desktoptheme
 kcoreaddons_desktop_to_json(kcm_desktoptheme "kcm_desktoptheme.desktop" SERVICE_TYPES kcmodule.desktop)
 
 #this desktop file is installed only for retrocompatibility with sycoca
-install(FILES kcm_desktoptheme.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES plasma-themes.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-install(TARGETS kcm_desktoptheme DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
+install(FILES kcm_desktoptheme.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+install(FILES plasma-themes.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+install(TARGETS kcm_desktoptheme DESTINATION ${KDE_INSTALL_PLUGINDIR}/kcms)
 
 kpackage_install_package(package kcm_desktoptheme kcms)

kcms/emoticons/CMakeLists.txt

@@ -10,8 +10,8 @@ target_link_libraries(kcm_emoticons
                       KF5::KDELibs4Support
                       KF5::Emoticons)
 
-install(TARGETS kcm_emoticons  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_emoticons  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 ########### install files ###############
-install( FILES emoticons.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES emoticons.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
+install( FILES emoticons.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES emoticons.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )

kcms/fonts/CMakeLists.txt

@@ -40,6 +40,6 @@ endif()
 kcoreaddons_desktop_to_json(kcm_fonts "kcm_fonts.desktop")
 
 ########### install files ###############
-install(TARGETS kcm_fonts DESTINATION ${PLUGIN_INSTALL_DIR}/kcms)
-install(FILES kcm_fonts.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+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)

kcms/formats/CMakeLists.txt

@@ -13,9 +13,9 @@ kcoreaddons_desktop_to_json(kcm_formats formats.desktop SERVICE_TYPES kcmodule.d
 
 target_link_libraries(kcm_formats Qt5::Core Qt5::DBus Qt5::Widgets KF5::I18n KF5::ConfigCore KF5::KCMUtils)
 
-install(TARGETS kcm_formats  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_formats  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
-install( FILES formats.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES formats.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )

kcms/hardware/joystick/CMakeLists.txt

@@ -23,11 +23,11 @@ target_link_libraries(kcm_joystick
     KF5::KDELibs4Support
 )
 
-install(TARGETS kcm_joystick  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_joystick  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
-install( FILES joystick.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES joystick.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
 #

kcms/icons/CMakeLists.txt

@@ -31,11 +31,11 @@ file(GENERATE OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/config.h CONTENT "#define CMAKE
 add_executable(plasma-changeicons changeicons.cpp)
 target_link_libraries(plasma-changeicons PRIVATE Qt5::Core KF5::KIOWidgets KF5::IconThemes)
 
-install(TARGETS kcm_icons  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_icons  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
-install( FILES icons.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
+install( FILES icons.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/icons.knsrc ${CMAKE_BINARY_DIR}/icons.knsrc)
-install( FILES ${CMAKE_BINARY_DIR}/icons.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
+install( FILES ${CMAKE_BINARY_DIR}/icons.knsrc  DESTINATION  ${KDE_INSTALL_CONFDIR} )
 
-install(TARGETS plasma-changeicons DESTINATION ${LIBEXEC_INSTALL_DIR} )
+install(TARGETS plasma-changeicons DESTINATION ${KDE_INSTALL_LIBEXECDIR} )

kcms/input/CMakeLists.txt

@@ -41,11 +41,11 @@ target_link_libraries(kcm_input
     ${kcminput_backend_LIBS}
 )
 
-install(TARGETS kcm_input  DESTINATION ${PLUGIN_INSTALL_DIR} )
+install(TARGETS kcm_input  DESTINATION ${KDE_INSTALL_PLUGINDIR} )
 
 
 ########### install files ###############
 
-install( FILES mouse.desktop  DESTINATION  ${SERVICES_INSTALL_DIR} )
-install( FILES cursor_large_black.pcf.gz cursor_large_white.pcf.gz cursor_small_white.pcf.gz  DESTINATION  ${DATA_INSTALL_DIR}/kcminput )
+install( FILES mouse.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
+install( FILES cursor_large_black.pcf.gz cursor_large_white.pcf.gz cursor_small_white.pcf.gz  DESTINATION  ${KDE_INSTALL_DATADIR}/kcminput )
 

kcms/input/backends/x11.cmake

@@ -40,4 +40,4 @@ target_link_libraries(kapplymousetheme
     ${kcminput_backend_LIBS}
 )
 
-install(TARGETS kapplymousetheme ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kapplymousetheme ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

kcms/input/pics/CMakeLists.txt

-install( FILES mouse_rh.png mouse_lh.png  DESTINATION  ${DATA_INSTALL_DIR}/kcminput/pics )
+install( FILES mouse_rh.png mouse_lh.png  DESTINATION  ${KDE_INSTALL_DATADIR}/kcminput/pics )

kcms/kded/CMakeLists.txt

@@ -4,8 +4,8 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kcm5_kded\")