From 6b0073455bb606aa95726b417105b73599d843ff Mon Sep 17 00:00:00 2001
From: Joakim Hove <joakim.hove@gmail.com>
Date: Sun, 26 Jan 2020 08:40:53 +0100
Subject: [PATCH] Pass RPATH to the python setup.py based build system

---
 CMakeLists.txt           | 25 ++++++++++++++++++++++++-
 python/setup-build.sh.in |  3 ++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a645b661..4d80602bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,12 +253,34 @@ if (OPM_ENABLE_PYTHON)
   string(REPLACE ";" ":" _setup_include_dirs "${_opmcommon_include_dirs}")
 
   if (CMAKE_PREFIX_PATH)
-    set(_opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib ${CMAKE_PREFIX_PATH}/lib)
+    set(_opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib ${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR})
   else()
     set(_opmcommon_lib_dirs ${PROJECT_BINARY_DIR}/lib)
   endif()
   string(REPLACE ";" ":" _setup_lib_dirs "${_opmcommon_lib_dirs}")
 
+  if (USE_RUNPATH)
+    set (_python_rpath_list)
+    if (CMAKE_PREFIX_PATH)
+      foreach(path ${CMAKE_PREFIX_PATH})
+        list(APPEND _python_rpath_list "${path}/${CMAKE_INSTALL_LIBDIR}")
+      endforeach()
+    endif()
+
+    if (BUILD_SHARED_LIBS)
+      list(APPEND _python_rpath_list "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
+    endif()
+
+    if (_python_rpath_list)
+      string(REPLACE ";" ":" _rpath "${_python_rpath_list}")
+      set( _rpath_arg "--rpath=${_rpath}")
+    else()
+      set(_rpath_arg "")
+    endif()
+  else()
+    set( _rpath_arg "")
+  endif()
+
   execute_process(COMMAND ${PYTHON_EXECUTABLE} target_name.py
                   WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/python
                   OUTPUT_VARIABLE python_lib_target)
@@ -274,6 +296,7 @@ if (OPM_ENABLE_PYTHON)
                                                       build_ext
                                                       --build-lib=${PROJECT_BINARY_DIR}/python/python/opm
                                                       --library-dirs=${_setup_lib_dirs}
+                                                      ${_rpath_arg}
                                                       --include-dirs=${_setup_include_dirs}
                      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/python
                      COMMENT "Building python bindings")
diff --git a/python/setup-build.sh.in b/python/setup-build.sh.in
index 7d9396a3f..b09a28b0c 100644
--- a/python/setup-build.sh.in
+++ b/python/setup-build.sh.in
@@ -10,10 +10,11 @@
 
 cp -r @PROJECT_SOURCE_DIR@/python @PROJECT_BINARY_DIR@
 cd @PROJECT_BINARY_DIR@/python
-rm -f python/opm/libopmcommon_python.so
+rm -f python/opm/libopmcommon_python*
 
 export CC=@CMAKE_CXX_COMPILER@
 
 @PYTHON_EXECUTABLE@ setup.py build build_ext --build-lib=python/opm \
 --library-dirs=@_setup_lib_dirs@ \
+@_rpath_arg@ \
 --include-dirs=@_setup_include_dirs@