Skip to content
Snippets Groups Projects
Commit 4ab5272a authored by Hahn, Steven's avatar Hahn, Steven
Browse files

Refs #10840. MantidPlot starts, but still has issues with python.

parent a0574354
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
......@@ -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
###########################################################################
......
......@@ -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
###########################################################################
......
......@@ -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
###########################################################################
......
......@@ -903,6 +903,7 @@ target_link_libraries ( MantidPlot
)
# Plugin dependencies
add_dependencies( MantidPlot mantidqtpython )
set_target_properties(MantidPlot PROPERTIES INSTALL_RPATH "@executable_path/")
###########################################################################
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment