Use KDEInstallDirs to insert paths into kwinwrapper

Reviewed-by: @apol
This commit is contained in:
Jonah Brüchert 2019-12-10 14:26:03 +00:00 committed by Bhushan Shah
parent 73306321b1
commit 28909aad84
2 changed files with 5 additions and 5 deletions

View file

@ -1,4 +1,5 @@
install(PROGRAMS kwinwrapper DESTINATION ${BIN_INSTALL_DIR}) configure_file(kwinwrapper.in ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper)
install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/kwinwrapper DESTINATION ${BIN_INSTALL_DIR})
configure_file(plasma-mobile.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-mobile.desktop) configure_file(plasma-mobile.desktop.cmake ${CMAKE_CURRENT_BINARY_DIR}/plasma-mobile.desktop)
install(FILES install(FILES

View file

@ -18,10 +18,9 @@ export FORCE_RIL_NUM_MODEMS=1
export PLASMA_DEFAULT_SHELL=org.kde.plasma.phone export PLASMA_DEFAULT_SHELL=org.kde.plasma.phone
# work around to fix : https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1507584 # work around to fix : https://bugs.launchpad.net/ubuntu/+source/mesa/+bug/1507584
_ARCH=arm-linux-gnueabihf if [ -d @KDE_INSTALL_FULL_LIBDIR@/libhybris-egl ]; then
if [ -d /usr/lib/$_ARCH/libhybris-egl ]; then export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@/libhybris-egl:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=/usr/lib/$_ARCH/libhybris-egl:$LD_LIBRARY_PATH
fi fi
touch /tmp/simplelogin_starting touch /tmp/simplelogin_starting
startplasma-wayland --xwayland --libinput --inputmethod maliit-server --exit-with-session=/usr/lib/$_ARCH/libexec/startplasma-waylandsession startplasma-wayland --xwayland --libinput --inputmethod maliit-server --exit-with-session=@KDE_INSTALL_FULL_LIBEXECDIR@/startplasma-waylandsession