aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <aleixpol@kde.org>2017-12-29 16:52:35 +0100
committerAleix Pol <aleixpol@kde.org>2018-01-28 23:22:52 +0100
commit34babd2ffc8617ba8e26fcb52bb11f32b94d8e28 (patch)
treeb18e3e5b3b6736a21287254d94eeaf13cc9cad50
parentc3080201989548e990da68a3099577335b3bc79a (diff)
downloadextra-cmake-modules-34babd2ffc8617ba8e26fcb52bb11f32b94d8e28.tar.gz
extra-cmake-modules-34babd2ffc8617ba8e26fcb52bb11f32b94d8e28.tar.bz2
Don't set the LD_LIBRARY_PATH in prefix.sh
Summary: We already have rpaths anyway and it breaks running applications from within the build directory: https://community.kde.org/Guidelines_and_HOWTOs/Making_apps_run_uninstalled Reviewers: #frameworks, dfaure, ngraham, graesslin Reviewed By: ngraham, graesslin Subscribers: graesslin, ngraham, #build_system Tags: #frameworks, #build_system Differential Revision: https://phabricator.kde.org/D9550
-rw-r--r--kde-modules/prefix.sh.cmake4
1 files changed, 3 insertions, 1 deletions
diff --git a/kde-modules/prefix.sh.cmake b/kde-modules/prefix.sh.cmake
index bddebeb5..4cc6fd97 100644
--- a/kde-modules/prefix.sh.cmake
+++ b/kde-modules/prefix.sh.cmake
@@ -1,5 +1,7 @@
export PATH=@KDE_INSTALL_FULL_BINDIR@:$PATH
-export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
+
+# LD_LIBRARY_PATH only needed if you are building without rpath
+# export LD_LIBRARY_PATH=@KDE_INSTALL_FULL_LIBDIR@:$LD_LIBRARY_PATH
export XDG_DATA_DIRS=@KDE_INSTALL_FULL_DATADIR@:${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}
export XDG_CONFIG_DIRS=@KDE_INSTALL_FULL_CONFDIR@:${XDG_CONFIG_DIRS:-/etc/xdg}