[qpid-dispatch] branch master updated: DISPATCH-1321 - Set RPATH for installed binaries in CMakeLists.txt

[jd...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 6b2da51  DISPATCH-1321 - Set RPATH for installed binaries in CMakeLists.txt
6b2da51 is described below

commit 6b2da51d9cea756124119c01c5891ad2ceacc9fd
Author: Jiri Danek <jd...@redhat.com>
AuthorDate: Sun Apr 14 23:31:38 2019 +0200

    DISPATCH-1321 - Set RPATH for installed binaries in CMakeLists.txt
---
 CMakeLists.txt | 1 +
 config.sh      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 72a6047..399f5f2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,6 +22,7 @@ project(qpid-dispatch C)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
 # Set default build type. Must use FORCE because project() sets default to ""
 if (NOT CMAKE_BUILD_TYPE)
diff --git a/config.sh b/config.sh
old mode 100644
new mode 100755
index 0e8cddd..fff867d
--- a/config.sh
+++ b/config.sh
@@ -29,6 +29,5 @@ export INSTALL_DIR=$SOURCE_DIR/${2:-install}
 PYTHON_BIN=`type -P python || type -P python3`
 PYTHON_LIB=$(${PYTHON_BIN} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(prefix='$INSTALL_DIR'))")
 
-export LD_LIBRARY_PATH=$INSTALL_DIR/lib64:$INSTALL_DIR/lib:$LD_LIBRARY_PATH
 export PYTHONPATH=$PYTHON_LIB:$PYTHONPATH
 export PATH=$INSTALL_DIR/sbin:$INSTALL_DIR/bin:$SOURCE_DIR/bin:$PATH


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org