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

use kpackage_install_bundled_package

Browse Source 
Summary:
use the new package install macro to install them as
as rcc files

Test Plan:
plasmashell starts and most plasmoids seem to work,
still needed a more thorough test

Reviewers: #plasma

Subscribers: davidedmundson, apol, plasma-devel, #frameworks

Tags: #plasma, #frameworks

Differential Revision: https://phabricator.kde.org/D9400
This commit is contained in:
Marco Martin 2018-03-20 14:54:42 +01:00
parent e3c5417799
commit 7af1892632
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
KF5PlasmaMacros.cmake
View File

@ -30,7 +30,18 @@ macro(plasma_install_package dir component)
set(type applet)
endif()
kpackage_install_package(${dir} ${component} ${root} ${PLASMA_RELATIVE_DATA_INSTALL_DIR} NO_DEPRECATED_WARNING)
list(LENGTH extra_macro_args num_extra_args)
set (extra_macro_args ${ARGN})
if (${num_extra_args} EQUAL 1)
list(GET extra_macro_args 0 bundle)
endif()
if(bundle)
kpackage_install_bundled_package(${dir} ${component} ${root} ${PLASMA_RELATIVE_DATA_INSTALL_DIR})
else()
kpackage_install_package(${dir} ${component} ${root} ${PLASMA_RELATIVE_DATA_INSTALL_DIR} NO_DEPRECATED_WARNING)
endif()
install(FILES ${dir}/metadata.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} RENAME plasma-${type}-${component}.desktop)
endmacro()