From f7f3c01ec88d980b76a7acc5270b3224539e539e Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fella@gmx.de>
Date: Thu, 21 Apr 2022 00:50:14 +0200
Subject: [PATCH] Use undeprecated install dirs

Using kde-dev-scripts/kf5/cmakelists_install_vars.pl
---
 app/CMakeLists.txt                  | 4 ++--
 cli/CMakeLists.txt                  | 2 +-
 core/CMakeLists.txt                 | 2 +-
 daemon/CMakeLists.txt               | 8 ++++----
 data/CMakeLists.txt                 | 2 +-
 declarativeplugin/CMakeLists.txt    | 4 ++--
 doc/CMakeLists.txt                  | 2 +-
 fileitemactionplugin/CMakeLists.txt | 2 +-
 icons/CMakeLists.txt                | 4 ++--
 indicator/CMakeLists.txt            | 4 ++--
 interfaces/CMakeLists.txt           | 2 +-
 kcm/CMakeLists.txt                  | 4 ++--
 kcmplugin/CMakeLists.txt            | 2 +-
 plasmoid/CMakeLists.txt             | 2 +-
 plugins/CMakeLists.txt              | 2 +-
 settings/CMakeLists.txt             | 4 ++--
 smsapp/CMakeLists.txt               | 2 +-
 urlhandler/CMakeLists.txt           | 4 ++--
 18 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index e5c813832..414f8bdea 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -24,5 +24,5 @@ add_executable(kdeconnect-app
 )
 target_link_libraries(kdeconnect-app Qt5::Quick Qt5::QuickControls2 Qt5::Widgets KF5::CoreAddons KF5::I18n KF5::KCMUtils)
 
-install(TARGETS kdeconnect-app ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS org.kde.kdeconnect.app.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS kdeconnect-app ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(PROGRAMS org.kde.kdeconnect.app.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt
index 647958802..4c1563b0c 100644
--- a/cli/CMakeLists.txt
+++ b/cli/CMakeLists.txt
@@ -11,5 +11,5 @@ target_link_libraries(kdeconnect-cli
     KF5::I18n
 )
 
-install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeconnect-cli ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(FILES kdeconnect.zsh RENAME _kdeconnect DESTINATION ${ZSH_AUTOCOMPLETE_DIR})
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 2778ed1f3..021384f16 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -85,4 +85,4 @@ set_target_properties(kdeconnectcore PROPERTIES
 
 generate_export_header(kdeconnectcore EXPORT_FILE_NAME kdeconnectcore_export.h BASE_NAME KDEConnectCore)
 
-install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(TARGETS kdeconnectcore EXPORT kdeconnectLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt
index 88dbb6055..042305a85 100644
--- a/daemon/CMakeLists.txt
+++ b/daemon/CMakeLists.txt
@@ -30,8 +30,8 @@ else()
 endif()
 configure_file(org.kde.kdeconnect.service.in ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service)
 
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.daemon.desktop DESTINATION ${AUTOSTART_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.daemon.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service DESTINATION ${DBUS_SERVICES_INSTALL_DIR})
-install(TARGETS kdeconnectd DESTINATION ${LIBEXEC_INSTALL_DIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.daemon.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.daemon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.kdeconnect.service DESTINATION ${KDE_INSTALL_DBUSSERVICEDIR})
+install(TARGETS kdeconnectd DESTINATION ${KDE_INSTALL_LIBEXECDIR})
 
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 5c33eb99e..5d673f0ab 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,6 +1,6 @@
 install (FILES "kdeconnect.contract" DESTINATION ${KDE_INSTALL_DATADIR}/contractor/)
 install (FILES "kdeconnect-thunar.desktop" DESTINATION ${KDE_INSTALL_DATADIR}/Thunar/sendto/)
-install(PROGRAMS org.kde.kdeconnect_open.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(PROGRAMS org.kde.kdeconnect_open.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 install (FILES "kdeconnect-dde.desktop" DESTINATION ${KDE_INSTALL_DATADIR}/deepin/dde-file-manager/oem-menuextensions/)
 
 if(NOT SAILFISHOS)
diff --git a/declarativeplugin/CMakeLists.txt b/declarativeplugin/CMakeLists.txt
index 39158ec32..251b7b105 100644
--- a/declarativeplugin/CMakeLists.txt
+++ b/declarativeplugin/CMakeLists.txt
@@ -19,8 +19,8 @@ else()
     target_compile_definitions(kdeconnectdeclarativeplugin PRIVATE -DWITH_WAYLAND=0)
 endif()
 
-install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
-install(FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/kdeconnect)
+install(TARGETS kdeconnectdeclarativeplugin DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kdeconnect)
+install(FILES qmldir DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kdeconnect)
 
 ecm_generate_qmltypes(org.kde.kdeconnect 1.0 DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/kdeconnect)
 
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index df281f563..e9dcf11eb 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1 +1 @@
-kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR kdeconnect)
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kdeconnect)
diff --git a/fileitemactionplugin/CMakeLists.txt b/fileitemactionplugin/CMakeLists.txt
index dd980bbdf..8efef4e74 100644
--- a/fileitemactionplugin/CMakeLists.txt
+++ b/fileitemactionplugin/CMakeLists.txt
@@ -15,4 +15,4 @@ target_link_libraries(
     kdeconnectinterfaces
     kdeconnectcore
 )
-install(TARGETS kdeconnectfileitemaction DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfileitemaction)
+install(TARGETS kdeconnectfileitemaction DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kfileitemaction)
diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 3f71e4c9a..d5bea84f5 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -12,7 +12,7 @@ if(APPLE)
     set(ICON_INSTALL_DIR share/kdeconnect-icons)
 endif()
 
-ecm_install_icons(ICONS ${APP_ICONS} DESTINATION ${ICON_INSTALL_DIR})
+ecm_install_icons(ICONS ${APP_ICONS} DESTINATION ${KDE_INSTALL_ICONDIR})
 
 ecm_install_icons(ICONS
     ${CMAKE_CURRENT_SOURCE_DIR}/status/16-status-laptopconnected.svg
@@ -51,4 +51,4 @@ ecm_install_icons(ICONS
     ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tvconnected.svg
     ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tvdisconnected.svg
     ${CMAKE_CURRENT_SOURCE_DIR}/status/32-status-tvtrusted.svg
-    DESTINATION ${ICON_INSTALL_DIR})
+    DESTINATION ${KDE_INSTALL_ICONDIR})
diff --git a/indicator/CMakeLists.txt b/indicator/CMakeLists.txt
index f0aa178e9..da5622ace 100644
--- a/indicator/CMakeLists.txt
+++ b/indicator/CMakeLists.txt
@@ -61,5 +61,5 @@ set_target_properties(kdeconnect-indicator PROPERTIES
     MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.kdeconnect")
 endif()
 
-install(TARGETS kdeconnect-indicator ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS kdeconnect-indicator ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(PROGRAMS org.kde.kdeconnect.nonplasma.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index aa16f4c36..e424dd717 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -77,4 +77,4 @@ LINK_PRIVATE
     KF5::CoreAddons
 )
 
-install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
index 80e45e6f8..ac74a33df 100644
--- a/kcm/CMakeLists.txt
+++ b/kcm/CMakeLists.txt
@@ -15,5 +15,5 @@ target_link_libraries(kcm_kdeconnect
     kdeconnectversion
 )
 
-install(TARGETS kcm_kdeconnect DESTINATION ${PLUGIN_INSTALL_DIR})
-install(FILES kcm_kdeconnect.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+install(TARGETS kcm_kdeconnect DESTINATION ${KDE_INSTALL_PLUGINDIR})
+install(FILES kcm_kdeconnect.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
diff --git a/kcmplugin/CMakeLists.txt b/kcmplugin/CMakeLists.txt
index 7cc35c859..8a3f735a1 100644
--- a/kcmplugin/CMakeLists.txt
+++ b/kcmplugin/CMakeLists.txt
@@ -20,4 +20,4 @@ set_target_properties(kdeconnectpluginkcm PROPERTIES
 generate_export_header(kdeconnectpluginkcm EXPORT_FILE_NAME kdeconnectpluginkcm_export.h BASE_NAME kdeconnectpluginkcm)
 
 # Remove NAMELINK_SKIP if/when headers are being installed and the library becomes public.
-install(TARGETS kdeconnectpluginkcm EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
+install(TARGETS kdeconnectpluginkcm EXPORT kdeconnectLibraryTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP)
diff --git a/plasmoid/CMakeLists.txt b/plasmoid/CMakeLists.txt
index 9ffe1e0b9..c798acd5d 100644
--- a/plasmoid/CMakeLists.txt
+++ b/plasmoid/CMakeLists.txt
@@ -1,5 +1,5 @@
 kpackage_install_package(package org.kde.kdeconnect plasmoids plasma NO_DEPRECATED_WARNING)
 
 install(FILES package/metadata.desktop
-        DESTINATION ${SERVICES_INSTALL_DIR}
+        DESTINATION ${KDE_INSTALL_KSERVICES5DIR}
         RENAME plasma-kdeconnect.desktop)
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ab85242c4..5e6c22526 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -61,4 +61,4 @@ endif()
 
 # If we split notifications per plugin, in several notifyrc files, they won't
 # appear in the same group in the Notifications KCM
-install(FILES kdeconnect.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
+install(FILES kdeconnect.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR})
diff --git a/settings/CMakeLists.txt b/settings/CMakeLists.txt
index 7c2715b8e..df22010fb 100644
--- a/settings/CMakeLists.txt
+++ b/settings/CMakeLists.txt
@@ -9,5 +9,5 @@ add_executable(kdeconnect-settings
 
 target_link_libraries(kdeconnect-settings kdeconnectversion KF5::I18n KF5::KCMUtils KF5::DBusAddons)
 
-install(TARGETS kdeconnect-settings ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES org.kde.kdeconnect-settings.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(TARGETS kdeconnect-settings ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(FILES org.kde.kdeconnect-settings.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/smsapp/CMakeLists.txt b/smsapp/CMakeLists.txt
index efde6d6e7..120ef4ac9 100644
--- a/smsapp/CMakeLists.txt
+++ b/smsapp/CMakeLists.txt
@@ -62,5 +62,5 @@ target_link_libraries(kdeconnect-sms
     KF5::KCMUtils
     )
 
-install(TARGETS kdeconnect-sms ${INSTALL_TARGETS_DEFAULT_ARGS})
+install(TARGETS kdeconnect-sms ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
 install(PROGRAMS org.kde.kdeconnect.sms.desktop DESTINATION ${KDE_INSTALL_APPDIR})
diff --git a/urlhandler/CMakeLists.txt b/urlhandler/CMakeLists.txt
index 71c1a2520..8a9d81aad 100644
--- a/urlhandler/CMakeLists.txt
+++ b/urlhandler/CMakeLists.txt
@@ -16,5 +16,5 @@ target_link_libraries(kdeconnect-handler
     KF5::KIOCore KF5::KIOFileWidgets KF5::KIOWidgets KF5::KIONTLM
 )
 
-install(TARGETS kdeconnect-handler ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(PROGRAMS org.kde.kdeconnect.handler.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} )
+install(TARGETS kdeconnect-handler ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
+install(PROGRAMS org.kde.kdeconnect.handler.desktop DESTINATION ${KDE_INSTALL_APPDIR} )