From 08fa8b736c17f75ed6e8b90ca6340080d684d8b6 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Fri, 12 Aug 2016 15:50:13 -0400
Subject: [PATCH] update rpaths.
---
MantidPlot/CMakeLists.txt | 2 +-
MantidQt/API/CMakeLists.txt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/MantidPlot/CMakeLists.txt b/MantidPlot/CMakeLists.txt
index 7c60f165cea..edadbda43c5 100644
--- a/MantidPlot/CMakeLists.txt
+++ b/MantidPlot/CMakeLists.txt
@@ -825,7 +825,7 @@ endif ()
add_dependencies( MantidPlot mantidqtpython CompilePyUI )
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties(MantidPlot PROPERTIES INSTALL_RPATH "@executable_path/")
+ set_target_properties(MantidPlot PROPERTIES INSTALL_RPATH "@executable_path;@executable_path/../Libraries")
endif ()
###########################################################################
diff --git a/MantidQt/API/CMakeLists.txt b/MantidQt/API/CMakeLists.txt
index 1c5a568b086..9ba1df6530e 100644
--- a/MantidQt/API/CMakeLists.txt
+++ b/MantidQt/API/CMakeLists.txt
@@ -152,7 +152,7 @@ add_library ( MantidQtAPI ${ALL_SRC} ${INC_FILES} ${UI_HDRS} )
set_target_properties ( MantidQtAPI PROPERTIES COMPILE_DEFINITIONS IN_MANTIDQT_API )
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidQtAPI PROPERTIES INSTALL_RPATH "@loader_path/../MacOS")
+ set_target_properties ( MantidQtAPI PROPERTIES INSTALL_RPATH "@loader_path/../MacOS;@loader_path/../Libraries")
endif ()
target_link_libraries ( MantidQtAPI LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME}
--
GitLab