From c99f43737a43efdf248d2e338f854dbe74424a59 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Wed, 18 Jul 2018 13:45:51 -0400
Subject: [PATCH] Fix RPATH issues on Ubuntu 18.04
---
qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt | 2 +-
qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt | 2 +-
qt/widgets/common/CMakeLists.txt | 2 +-
qt/widgets/factory/CMakeLists.txt | 3 ++-
qt/widgets/legacyqwt/CMakeLists.txt | 2 +-
qt/widgets/sliceviewer/CMakeLists.txt | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt b/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt
index a67121969ad..5c88fb44d86 100644
--- a/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt
+++ b/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt
@@ -52,7 +52,7 @@ mtd_add_qt_library (TARGET_NAME VatesSimpleGuiQtWidgets
@loader_path/../../Contents/Libraries
@loader_path/../../Contents/MacOS
LINUX_INSTALL_RPATH
- "\$ORIGIN/../../${LIB_DIR}"
+ "\$ORIGIN/../${LIB_DIR}"
)
# Set the name of the generated library
diff --git a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
index 68d604c13eb..857283f5a02 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -136,7 +136,7 @@ mtd_add_qt_library (TARGET_NAME VatesSimpleGuiViewWidgets
@loader_path/../../Contents/MacOS
@loader_path/../../Contents/Libraries
LINUX_INSTALL_RPATH
- "\$ORIGIN/../../${LIB_DIR};\$ORIGIN"
+ "\$ORIGIN/../${LIB_DIR};\$ORIGIN"
)
# Set the name of the generated library
diff --git a/qt/widgets/common/CMakeLists.txt b/qt/widgets/common/CMakeLists.txt
index 60a626ec6eb..58323bb8d14 100644
--- a/qt/widgets/common/CMakeLists.txt
+++ b/qt/widgets/common/CMakeLists.txt
@@ -535,7 +535,7 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsCommon
@loader_path/../MacOS
@loader_path/../Libraries
LINUX_INSTALL_RPATH
- "\$ORIGIN/../../${LIB_DIR}"
+ "\$ORIGIN/../${LIB_DIR}"
)
###########################################################################
diff --git a/qt/widgets/factory/CMakeLists.txt b/qt/widgets/factory/CMakeLists.txt
index c450d7876fc..1f6dd12c4dd 100644
--- a/qt/widgets/factory/CMakeLists.txt
+++ b/qt/widgets/factory/CMakeLists.txt
@@ -37,6 +37,7 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsFactory
MantidQtWidgetsCommon
MantidQtWidgetsLegacyQwt
MantidQtWidgetsSliceViewer
+ LINUX_INSTALL_RPATH
+ "\$ORIGIN/../${LIB_DIR}"
)
-
diff --git a/qt/widgets/legacyqwt/CMakeLists.txt b/qt/widgets/legacyqwt/CMakeLists.txt
index ad33de02b3a..004a0271725 100644
--- a/qt/widgets/legacyqwt/CMakeLists.txt
+++ b/qt/widgets/legacyqwt/CMakeLists.txt
@@ -80,7 +80,7 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsLegacyQwt
OSX_INSTALL_RPATH
@loader_path/../MacOS
LINUX_INSTALL_RPATH
- "\$ORIGIN/../../${LIB_DIR}"
+ "\$ORIGIN/../${LIB_DIR}"
)
###########################################################################
diff --git a/qt/widgets/sliceviewer/CMakeLists.txt b/qt/widgets/sliceviewer/CMakeLists.txt
index 6343a7bb3af..3473c45edde 100644
--- a/qt/widgets/sliceviewer/CMakeLists.txt
+++ b/qt/widgets/sliceviewer/CMakeLists.txt
@@ -141,7 +141,7 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsSliceViewer
OSX_INSTALL_RPATH
loader_path/../MacOS
LINUX_INSTALL_RPATH
- "\$ORIGIN/../../${LIB_DIR}"
+ "\$ORIGIN/../${LIB_DIR}"
)
###########################################################################
--
GitLab