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

Refs #10840. update sip and pyqt versions. Needs more general fix.

parent 04e67503
No related merge requests found
......@@ -132,9 +132,9 @@ else()
#set ( CMAKE_OSX_ARCHITECTURES x86_64 )
#set ( CMAKE_OSX_DEPLOYMENT_TARGET 10.9 )
#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 ( PYQT4_PYTHONPATH /usr/local/Cellar/pyqt/4.11.3/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 )
set ( SITEPACKAGES /usr/local/Cellar/sip/4.16.5/lib/python${PY_VER}/site-packages )
# use homebrew OpenSSL package
set ( OPENSSL_ROOT_DIR /usr/local/opt/openssl )
endif()
......
......@@ -1045,4 +1045,4 @@ install ( FILES ${CONFIG_RESET_SCRIPT} DESTINATION ${BIN_DIR} )
#endif ()
message ("cmake install prefix: ${CMAKE_INSTALL_PREFIX}")
install ( FILES make_package.rb DESTINATION MantidPlot.app/ )
install( CODE "execute_process(COMMAND \"chmod + x MantidPlot.app/make_package.rb\" )")
install( CODE "execute_process(COMMAND \"chmod + x \${CMAKE_INSTALL_PREFIX}/MantidPlot.app/make_package.rb\" )")
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