diff --git a/Code/Mantid/Build/CMake/DarwinSetup.cmake b/Code/Mantid/Build/CMake/DarwinSetup.cmake index 8e519bc7ecdc49d1eba5876982b19aca28633fca..40ad7f3382b97559bc1d1e397a11ad03958ceb79 100644 --- a/Code/Mantid/Build/CMake/DarwinSetup.cmake +++ b/Code/Mantid/Build/CMake/DarwinSetup.cmake @@ -102,6 +102,10 @@ endif() ########################################################################### # Mac-specific installation setup ########################################################################### + +set(CMAKE_MACOSX_RPATH 1) + +#set ( CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/${LIB_DIR};${CMAKE_INSTALL_PREFIX}/${PLUGINS_DIR};${CMAKE_INSTALL_PREFIX}/${PVPLUGINS_DIR} ) set ( CMAKE_INSTALL_PREFIX "" ) set ( CPACK_PACKAGE_EXECUTABLES MantidPlot ) set ( INBUNDLE MantidPlot.app/ ) @@ -127,8 +131,10 @@ else() set ( CMAKE_OSX_SYSROOT /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk ) set ( CMAKE_OSX_ARCHITECTURES x86_64 ) set ( CMAKE_OSX_DEPLOYMENT_TARGET 10.8 ) - set ( PYQT4_PYTHONPATH /usr/local/lib/python${PY_VER}/site-packages/PyQt4 ) - set ( SITEPACKAGES /usr/local/lib/python${PY_VER}/site-packages ) + #set ( PYQT4_PYTHONPATH /usr/local/lib/python${PY_VER}/site-packages/PyQt4 ) + set ( PYQT4_PYTHONPATH /usr/local/Cellar/pyqt/4.11.1/lib/python${PY_VER}/site-packages/PyQt4 ) + #set ( SITEPACKAGES /usr/local/lib/python${PY_VER}/site-packages ) + set ( SITEPACKAGES /usr/local/Cellar/sip/4.16.3_1/lib/python${PY_VER}/site-packages ) # use homebrew OpenSSL package set ( OPENSSL_ROOT_DIR /usr/local/opt/openssl ) endif() diff --git a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt index 278e1ff5abd35d08d9d51385f83bd11d0a8bc173..20d6dd2df2922b6b080ba17a7054c80b0dee22e1 100644 --- a/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt +++ b/Code/Mantid/Framework/PythonInterface/mantid/api/CMakeLists.txt @@ -130,7 +130,7 @@ set_target_output_directory ( PythonAPIModule ${OUTPUT_DIR} .pyd ) # Add the required dependencies target_link_libraries ( PythonAPIModule PythonGeometryModule PythonKernelModule API ) - +set_target_properties( PythonAPIModule PROPERTIES INSTALL_RPATH "@loader_path/../../;@loader_path/../kernel/") ########################################################################### # Installation settings ########################################################################### diff --git a/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt index 88a59fc6d3a0a8876745d32baf0b6d3117aacc27..43dd2bebddd5a41c12f88d03660a0adcb9946d49 100644 --- a/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt +++ b/Code/Mantid/Framework/PythonInterface/mantid/geometry/CMakeLists.txt @@ -71,7 +71,7 @@ set_python_properties( PythonGeometryModule _geometry ) set_target_output_directory ( PythonGeometryModule ${OUTPUT_DIR} .pyd ) # Add the required dependencies target_link_libraries ( PythonGeometryModule PythonKernelModule Geometry ) - +set_target_properties ( PythonGeometryModule PROPERTIES INSTALL_RPATH "@loader_path/../../;@loader_path/../kernel/") ########################################################################### # Installation settings ########################################################################### diff --git a/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt b/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt index a04a8ca737db0351dc9cc10df8e596dd35a2c85b..72b5ee7a7e3fd5d0c4077f5dc73034d3fa0df658 100644 --- a/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt +++ b/Code/Mantid/Framework/PythonInterface/mantid/kernel/CMakeLists.txt @@ -158,7 +158,7 @@ set_python_properties( PythonKernelModule _kernel ) set_target_output_directory ( PythonKernelModule ${OUTPUT_DIR} .pyd ) # Add the required dependencies target_link_libraries ( PythonKernelModule Kernel ${Boost_LIBRARIES} ${PYTHON_LIBRARIES} ${PYTHON_DEPS} ) - +set_target_properties ( PythonKernelModule PROPERTIES INSTALL_RPATH "@loader_path/../../") ########################################################################### # Installation settings ########################################################################### diff --git a/Code/Mantid/MantidPlot/CMakeLists.txt b/Code/Mantid/MantidPlot/CMakeLists.txt index 8f22c8fb8b55b15c93f120ad35d78fdc5c8f94f6..622c6640f5ff9100888d3d1469684a70732bc757 100644 --- a/Code/Mantid/MantidPlot/CMakeLists.txt +++ b/Code/Mantid/MantidPlot/CMakeLists.txt @@ -903,6 +903,7 @@ target_link_libraries ( MantidPlot ) # Plugin dependencies add_dependencies( MantidPlot mantidqtpython ) +set_target_properties(MantidPlot PROPERTIES INSTALL_RPATH "@executable_path/") ###########################################################################