Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
4f8b4728
Commit
4f8b4728
authored
10 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Refs #10840. return to 10.8 deployment target. change id on libqsqlite
parent
f2f2f8dc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Code/Mantid/Build/CMake/DarwinSetup.cmake
+4
-0
4 additions, 0 deletions
Code/Mantid/Build/CMake/DarwinSetup.cmake
Code/Mantid/MantidPlot/make_package.rb
+1
-0
1 addition, 0 deletions
Code/Mantid/MantidPlot/make_package.rb
with
5 additions
and
0 deletions
Code/Mantid/Build/CMake/DarwinSetup.cmake
+
4
−
0
View file @
4f8b4728
...
@@ -126,6 +126,10 @@ if (OSX_VERSION VERSION_LESS 10.9)
...
@@ -126,6 +126,10 @@ if (OSX_VERSION VERSION_LESS 10.9)
else
()
else
()
set
(
CMAKE_MACOSX_RPATH 1
)
set
(
CMAKE_MACOSX_RPATH 1
)
# Assume we are using homebrew for now
# 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
# Follow symlinks so cmake copies the file
set
(
PYQT4_PATH /usr/local/lib/python
${
PY_VER
}
/site-packages/PyQt4
)
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
)
execute_process
(
COMMAND readlink
${
PYQT4_PATH
}
/Qt.so OUTPUT_VARIABLE PYQT4_SYMLINK_Qtso
)
...
...
This diff is collapsed.
Click to expand it.
Code/Mantid/MantidPlot/make_package.rb
+
1
−
0
View file @
4f8b4728
...
@@ -97,6 +97,7 @@ end
...
@@ -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 -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
#change id of all Qt4 imageformats libraries
qt4_patterns
=
[
"**/imageformats/*.dylib"
]
qt4_patterns
=
[
"**/imageformats/*.dylib"
]
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment