Fix RPATH issues on Ubuntu 18.04

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

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

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}"
 )
 
 ###########################################################################

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}"
 )
 
-

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}"
 )
 
 ###########################################################################

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}"
 )
 
 ###########################################################################