From 4f8b472851c2e3d302fb681e9c6a5e39d9f04397 Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Fri, 23 Jan 2015 15:49:00 -0500
Subject: [PATCH] Refs #10840. return to 10.8 deployment target. change id on
libqsqlite
---
Code/Mantid/Build/CMake/DarwinSetup.cmake | 4 ++++
Code/Mantid/MantidPlot/make_package.rb | 1 +
2 files changed, 5 insertions(+)
diff --git a/Code/Mantid/Build/CMake/DarwinSetup.cmake b/Code/Mantid/Build/CMake/DarwinSetup.cmake
index 5975734b47b..c41894c747d 100644
--- a/Code/Mantid/Build/CMake/DarwinSetup.cmake
+++ b/Code/Mantid/Build/CMake/DarwinSetup.cmake
@@ -126,6 +126,10 @@ if (OSX_VERSION VERSION_LESS 10.9)
else()
set(CMAKE_MACOSX_RPATH 1)
# Assume we are using homebrew for now
+ # set Deployment target to 10.8
+ 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 )
# Follow symlinks so cmake copies the file
set ( PYQT4_PATH /usr/local/lib/python${PY_VER}/site-packages/PyQt4 )
execute_process(COMMAND readlink ${PYQT4_PATH}/Qt.so OUTPUT_VARIABLE PYQT4_SYMLINK_Qtso)
diff --git a/Code/Mantid/MantidPlot/make_package.rb b/Code/Mantid/MantidPlot/make_package.rb
index 9b649032bfb..af222a834a6 100755
--- a/Code/Mantid/MantidPlot/make_package.rb
+++ b/Code/Mantid/MantidPlot/make_package.rb
@@ -97,6 +97,7 @@ end
`install_name_tool -change /usr/local/lib/QtCore.framework/Versions/4/QtCore @loader_path/../Frameworks/QtCore.framework/Versions/4/QtCore Contents/MacOS/libqscintilla2.11.dylib`
`install_name_tool -change /usr/local/lib/QtCore.framework/Versions/4/QtCore @loader_path/../Frameworks/QtCore.framework/Versions/4/QtCore Contents/MacOS/libqscintilla2.11.dylib`
+`install_name_tool -id @rpath/libqsqlite.dylib Contents/Frameworks/plugins/sqldrivers/libqsqlite.dylib`
#change id of all Qt4 imageformats libraries
qt4_patterns = ["**/imageformats/*.dylib"]
--
GitLab