From eb9c0bbdf8dbb26bd701acb9a896fe6fe01877b9 Mon Sep 17 00:00:00 2001
From: "Friedrich W. H. Kossebau" <kossebau@kde.org>
Date: Wed, 31 Aug 2016 01:43:15 +0200
Subject: [PATCH] Make plasma_install_package work with 
 KDE_INSTALL_DIRS_NO_DEPRECATED

Summary:
Currently plasma_install_package fails if KDE_INSTALL_DIRS_NO_DEPRECATED
is set to TRUE, because the macro is still using the deprecated vars
DATA_INSTALL_DIR & SERVICES_INSTALL_DIR.
It should be fine to bump the min version of ECM required to needed ECM 1.6.0,
as someone using KF5 5.26 very surely also has a similar recent ECM.

Reviewers: #plasma, sebas, mart

Reviewed By: mart

Subscribers: plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D2633
---
 KF5PlasmaMacros.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/KF5PlasmaMacros.cmake b/KF5PlasmaMacros.cmake
index e9268f442..5827854c2 100644
--- a/KF5PlasmaMacros.cmake
+++ b/KF5PlasmaMacros.cmake
@@ -1,9 +1,9 @@
 
-find_package(ECM 0.0.9 CONFIG REQUIRED)
+find_package(ECM 1.6.0 CONFIG REQUIRED)
 include(KDEInstallDirs)
 
 set(PLASMA_RELATIVE_DATA_INSTALL_DIR "plasma")
-set(PLASMA_DATA_INSTALL_DIR "${DATA_INSTALL_DIR}/${PLASMA_RELATIVE_DATA_INSTALL_DIR}")
+set(PLASMA_DATA_INSTALL_DIR "${KDE_INSTALL_DATADIR}/${PLASMA_RELATIVE_DATA_INSTALL_DIR}")
 
 # plasma_install_package(path componentname [root] [type])
 #
@@ -31,7 +31,7 @@ macro(plasma_install_package dir component)
    endif()
 
    kpackage_install_package(${dir} ${component} ${root} ${PLASMA_RELATIVE_DATA_INSTALL_DIR})
-   install(FILES ${dir}/metadata.desktop DESTINATION ${SERVICES_INSTALL_DIR} RENAME plasma-${type}-${component}.desktop)
+   install(FILES ${dir}/metadata.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME plasma-${type}-${component}.desktop)
 endmacro()