From d7622ba6d986b3c9cbcd8eaf92fef16ffa6d091f Mon Sep 17 00:00:00 2001
From: Martyn Gigg <martyn.gigg@gmail.com>
Date: Wed, 8 Nov 2017 08:44:09 +0000
Subject: [PATCH] Fix RPATH on installed plugins for OSX
Refs #20288
---
MantidPlot/make_package.rb.in | 6 ------
.../PVPlugins/Filters/PeaksFilter/CMakeLists.txt | 2 +-
.../PVPlugins/Filters/ScaleWorkspace/CMakeLists.txt | 2 +-
.../PVPlugins/Filters/SplatterPlot/CMakeLists.txt | 2 +-
.../PVPlugins/Readers/MDEWNexusReader/CMakeLists.txt | 2 +-
.../PVPlugins/Readers/MDHWNexusReader/CMakeLists.txt | 2 +-
.../PVPlugins/Readers/NexusPeaksReader/CMakeLists.txt | 2 +-
.../PVPlugins/Readers/PeaksReader/CMakeLists.txt | 2 +-
qt/paraview_ext/PVPlugins/Sources/MDEWSource/CMakeLists.txt | 2 +-
qt/paraview_ext/PVPlugins/Sources/MDHWSource/CMakeLists.txt | 2 +-
.../PVPlugins/Sources/PeaksSource/CMakeLists.txt | 2 +-
.../PVPlugins/Sources/SinglePeakMarkerSource/CMakeLists.txt | 2 +-
qt/paraview_ext/VatesAlgorithms/CMakeLists.txt | 2 +-
qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt | 4 ++--
qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt | 4 ++--
qt/scientific_interfaces/DynamicPDF/CMakeLists.txt | 2 +-
qt/scientific_interfaces/EnggDiffraction/CMakeLists.txt | 4 ++--
qt/scientific_interfaces/General/CMakeLists.txt | 2 +-
qt/scientific_interfaces/ISISReflectometry/CMakeLists.txt | 2 +-
qt/scientific_interfaces/ISISSANS/CMakeLists.txt | 4 ++--
qt/scientific_interfaces/Indirect/CMakeLists.txt | 4 ++--
qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt | 2 +-
qt/scientific_interfaces/Muon/CMakeLists.txt | 4 ++--
qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt | 2 +-
24 files changed, 29 insertions(+), 35 deletions(-)
diff --git a/MantidPlot/make_package.rb.in b/MantidPlot/make_package.rb.in
index 0d65a8e2123..ffa0eb067da 100755
--- a/MantidPlot/make_package.rb.in
+++ b/MantidPlot/make_package.rb.in
@@ -378,12 +378,6 @@ h5py_patterns.each do |pattern|
end
end
-# ---------------------------------------------
-# Fix imports for Mantid Scientific Interfaces
-# ---------------------------------------------
-`install_name_tool -add_rpath @loader_path/../../../plugins/qt4 ./plugins/qt4/libMantidScientificInterfacesEnggDiffractionQt4.dylib`
-# ---------------------------------------------
-
files = ["gnureadline.so","readline.py","pyparsing.py","mistune.py"]
files.each do |file|
copyFile("#{path}/#{file}")
diff --git a/qt/paraview_ext/PVPlugins/Filters/PeaksFilter/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Filters/PeaksFilter/CMakeLists.txt
index bdf31ea4737..e0971994ed1 100644
--- a/qt/paraview_ext/PVPlugins/Filters/PeaksFilter/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Filters/PeaksFilter/CMakeLists.txt
@@ -15,7 +15,7 @@ ${vtkjsoncpp_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewPeaksFilterSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewPeaksFilterSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewPeaksFilterSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Filters/ScaleWorkspace/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Filters/ScaleWorkspace/CMakeLists.txt
index f6b7870c06e..ba3867bd517 100644
--- a/qt/paraview_ext/PVPlugins/Filters/ScaleWorkspace/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Filters/ScaleWorkspace/CMakeLists.txt
@@ -13,7 +13,7 @@ ${vtkjsoncpp_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewScaleWorkspaceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewScaleWorkspaceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewScaleWorkspaceSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Filters/SplatterPlot/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Filters/SplatterPlot/CMakeLists.txt
index 10439287ced..5c8b6c4eba7 100644
--- a/qt/paraview_ext/PVPlugins/Filters/SplatterPlot/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Filters/SplatterPlot/CMakeLists.txt
@@ -20,7 +20,7 @@ ${vtkjsoncpp_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewSplatterPlotSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewSplatterPlotSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewSplatterPlotSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Readers/MDEWNexusReader/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Readers/MDEWNexusReader/CMakeLists.txt
index c075e2a9d5c..8b0b72ddb5c 100644
--- a/qt/paraview_ext/PVPlugins/Readers/MDEWNexusReader/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Readers/MDEWNexusReader/CMakeLists.txt
@@ -20,7 +20,7 @@ Qt4::QtCore
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewMDEWNexusReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewMDEWNexusReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewMDEWNexusReaderSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Readers/MDHWNexusReader/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Readers/MDHWNexusReader/CMakeLists.txt
index ad7c97bd5e9..ab78ea7f66e 100644
--- a/qt/paraview_ext/PVPlugins/Readers/MDHWNexusReader/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Readers/MDHWNexusReader/CMakeLists.txt
@@ -20,7 +20,7 @@ Qt4::QtCore
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewMDHWNexusReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewMDHWNexusReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewMDHWNexusReaderSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Readers/NexusPeaksReader/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Readers/NexusPeaksReader/CMakeLists.txt
index 65556f90ef5..1f81b8f7361 100644
--- a/qt/paraview_ext/PVPlugins/Readers/NexusPeaksReader/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Readers/NexusPeaksReader/CMakeLists.txt
@@ -16,7 +16,7 @@ ${NEXUS_LIBRARIES}
${NEXUS_C_LIBRARIES})
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewNexusPeaksReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewNexusPeaksReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewNexusPeaksReaderSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Readers/PeaksReader/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Readers/PeaksReader/CMakeLists.txt
index 5d41d63321e..5aeb1d90d62 100644
--- a/qt/paraview_ext/PVPlugins/Readers/PeaksReader/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Readers/PeaksReader/CMakeLists.txt
@@ -18,7 +18,7 @@ ${Boost_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewPeaksReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewPeaksReaderSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewPeaksReaderSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Sources/MDEWSource/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Sources/MDEWSource/CMakeLists.txt
index dde772aa9b8..0e2c165d463 100644
--- a/qt/paraview_ext/PVPlugins/Sources/MDEWSource/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Sources/MDEWSource/CMakeLists.txt
@@ -18,7 +18,7 @@ Qt4::QtCore
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewMDEWSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewMDEWSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewMDEWSourceSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Sources/MDHWSource/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Sources/MDHWSource/CMakeLists.txt
index 1cd98e35cd0..394c4727540 100644
--- a/qt/paraview_ext/PVPlugins/Sources/MDHWSource/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Sources/MDHWSource/CMakeLists.txt
@@ -19,7 +19,7 @@ Qt4::QtCore
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewMDHWSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewMDHWSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewMDHWSourceSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Sources/PeaksSource/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Sources/PeaksSource/CMakeLists.txt
index f4adb80d4e5..e0ba945b3b9 100644
--- a/qt/paraview_ext/PVPlugins/Sources/PeaksSource/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Sources/PeaksSource/CMakeLists.txt
@@ -14,7 +14,7 @@ ${Boost_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewPeaksSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewPeaksSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewPeaksSourceSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/PVPlugins/Sources/SinglePeakMarkerSource/CMakeLists.txt b/qt/paraview_ext/PVPlugins/Sources/SinglePeakMarkerSource/CMakeLists.txt
index eb0f3a52f02..3e3e60f7816 100644
--- a/qt/paraview_ext/PVPlugins/Sources/SinglePeakMarkerSource/CMakeLists.txt
+++ b/qt/paraview_ext/PVPlugins/Sources/SinglePeakMarkerSource/CMakeLists.txt
@@ -8,7 +8,7 @@ set_pvplugin_properties (MantidParaViewSinglePeakMarkerSourceSMPlugin QT_VERSION
target_link_libraries( MantidParaViewSinglePeakMarkerSourceSMPlugin LINK_PRIVATE ${TCMALLOC_LIBRARIES_LINKTIME} ${CORE_MANTIDLIBS} VatesAPI )
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( MantidParaViewSinglePeakMarkerSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../Contents/Libraries;@loader_path/../../Contents/MacOS")
+ set_target_properties ( MantidParaViewSinglePeakMarkerSourceSMPlugin PROPERTIES INSTALL_RPATH "@loader_path/../../../Contents/Libraries;@loader_path/../../../Contents/MacOS")
endif ()
install_pvplugin (MantidParaViewSinglePeakMarkerSourceSMPlugin QT_VERSION 4)
diff --git a/qt/paraview_ext/VatesAlgorithms/CMakeLists.txt b/qt/paraview_ext/VatesAlgorithms/CMakeLists.txt
index 1fb25ed06b7..97bee3062f6 100644
--- a/qt/paraview_ext/VatesAlgorithms/CMakeLists.txt
+++ b/qt/paraview_ext/VatesAlgorithms/CMakeLists.txt
@@ -49,7 +49,7 @@ ${POCO_LIBRARIES}
)
if (OSX_VERSION VERSION_GREATER 10.8)
- set_target_properties ( VatesAlgorithms PROPERTIES INSTALL_RPATH "@loader_path/../MacOS;@loader_path/../Libraries")
+ set_target_properties ( VatesAlgorithms PROPERTIES INSTALL_RPATH "@loader_path/../Contents/MacOS;@loader_path/../Libraries")
endif ()
# Create test file projects
diff --git a/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt b/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt
index 69bc4f00339..03cea465344 100644
--- a/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt
+++ b/qt/paraview_ext/VatesSimpleGui/QtWidgets/CMakeLists.txt
@@ -51,8 +51,8 @@ mtd_add_qt_library (TARGET_NAME VatesSimpleGuiQtWidgets
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../Contents/Libraries
- @loader_path/../Contents/MacOS
+ @loader_path/../../Contents/Libraries
+ @loader_path/../../Contents/MacOS
)
# 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 efc1d5ef752..9380316c70b 100644
--- a/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
+++ b/qt/paraview_ext/VatesSimpleGui/ViewWidgets/CMakeLists.txt
@@ -135,8 +135,8 @@ mtd_add_qt_library (TARGET_NAME VatesSimpleGuiViewWidgets
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../Contents/MacOS
- @loader_path/../Contents/Libraries
+ @loader_path/../../Contents/MacOS
+ @loader_path/../../Contents/Libraries
)
# Set the name of the generated library
diff --git a/qt/scientific_interfaces/DynamicPDF/CMakeLists.txt b/qt/scientific_interfaces/DynamicPDF/CMakeLists.txt
index 7dbb1dabd92..02ab9976ff2 100644
--- a/qt/scientific_interfaces/DynamicPDF/CMakeLists.txt
+++ b/qt/scientific_interfaces/DynamicPDF/CMakeLists.txt
@@ -68,7 +68,7 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesDynamicPDF
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
+ @loader_path/../../Contents/MacOS
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/EnggDiffraction/CMakeLists.txt b/qt/scientific_interfaces/EnggDiffraction/CMakeLists.txt
index 877d790203e..76fb1892998 100644
--- a/qt/scientific_interfaces/EnggDiffraction/CMakeLists.txt
+++ b/qt/scientific_interfaces/EnggDiffraction/CMakeLists.txt
@@ -65,8 +65,8 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesEnggDiffraction
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
- @loader_path/../../../plugins/qtplugins/mantid
+ @loader_path/../../Contents/MacOS
+ @loader_path/../../plugins/qt4
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/General/CMakeLists.txt b/qt/scientific_interfaces/General/CMakeLists.txt
index ee6a8b87a45..1be0f2ebeb5 100644
--- a/qt/scientific_interfaces/General/CMakeLists.txt
+++ b/qt/scientific_interfaces/General/CMakeLists.txt
@@ -63,7 +63,7 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesGeneral
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
+ @loader_path/../../Contents/MacOS
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/ISISReflectometry/CMakeLists.txt b/qt/scientific_interfaces/ISISReflectometry/CMakeLists.txt
index ebc85715455..48c80af4e4d 100644
--- a/qt/scientific_interfaces/ISISReflectometry/CMakeLists.txt
+++ b/qt/scientific_interfaces/ISISReflectometry/CMakeLists.txt
@@ -120,7 +120,7 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesISISReflectometry
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
+ @loader_path/../../Contents/MacOS
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/ISISSANS/CMakeLists.txt b/qt/scientific_interfaces/ISISSANS/CMakeLists.txt
index 60b30d8305f..86e06888944 100644
--- a/qt/scientific_interfaces/ISISSANS/CMakeLists.txt
+++ b/qt/scientific_interfaces/ISISSANS/CMakeLists.txt
@@ -66,8 +66,8 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesISISSANS
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
- @loader_path/../../../plugins/qtplugins/mantid
+ @loader_path/../../Contents/MacOS
+ @loader_path/../../plugins/qt4
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/Indirect/CMakeLists.txt b/qt/scientific_interfaces/Indirect/CMakeLists.txt
index c3545a3a0df..81cada9ae42 100644
--- a/qt/scientific_interfaces/Indirect/CMakeLists.txt
+++ b/qt/scientific_interfaces/Indirect/CMakeLists.txt
@@ -193,8 +193,8 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesIndirect
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
- @loader_path/../../../plugins/qtplugins/mantid
+ @loader_path/../../Contents/MacOS
+ @loader_path/../../plugins/qt4
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt b/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt
index e9779aa7288..153efc05279 100644
--- a/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt
+++ b/qt/scientific_interfaces/MultiDatasetFit/CMakeLists.txt
@@ -70,7 +70,7 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesMultiDatasetFit
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
+ @loader_path/../../Contents/MacOS
)
if ( MSVC_IDE )
diff --git a/qt/scientific_interfaces/Muon/CMakeLists.txt b/qt/scientific_interfaces/Muon/CMakeLists.txt
index 5af7c8703e8..0b154cf18bc 100644
--- a/qt/scientific_interfaces/Muon/CMakeLists.txt
+++ b/qt/scientific_interfaces/Muon/CMakeLists.txt
@@ -109,8 +109,8 @@ mtd_add_qt_library (TARGET_NAME MantidScientificInterfacesMuon
INSTALL_DIR_BASE
${PLUGINS_DIR}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
- @loader_path/../../../plugins/qtplugins/mantid
+ @loader_path/../../Contents/MacOS
+ @loader_path/../../plugins/qt4
)
if ( MSVC_IDE )
diff --git a/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt b/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt
index 538683f64ee..47bc965f209 100644
--- a/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt
+++ b/qt/widgets/plugins/algorithm_dialogs/CMakeLists.txt
@@ -75,7 +75,7 @@ mtd_add_qt_library (TARGET_NAME MantidQtWidgetsPluginsAlgorithmDialogs
OUTPUT_DIR_BASE
${PLUGINS_LIBRARY_OUTPUT_DIRECTORY}
OSX_INSTALL_RPATH
- @loader_path/../../../Contents/MacOS
+ @loader_path/../../Contents/MacOS
INSTALL_DIR_BASE
${PLUGINS_DIR}
)
--
GitLab