alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make plasma_install_package work with KDE_INSTALL_DIRS_NO_DEPRECATED

Browse Source 
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
This commit is contained in:
Friedrich W. H. Kossebau 2016-08-31 01:43:15 +02:00
parent a4ff82f7f2
commit eb9c0bbdf8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
KF5PlasmaMacros.cmake
View File

@ -1,9 +1,9 @@
find_package(ECM 0.0.9 CONFIG REQUIRED) find_package(ECM 1.6.0 CONFIG REQUIRED)
include(KDEInstallDirs) include(KDEInstallDirs)
set(PLASMA_RELATIVE_DATA_INSTALL_DIR "plasma") 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]) # plasma_install_package(path componentname [root] [type])
# #
@ -31,7 +31,7 @@ macro(plasma_install_package dir component)
endif() endif()
kpackage_install_package(${dir} ${component} ${root} ${PLASMA_RELATIVE_DATA_INSTALL_DIR}) 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() endmacro()