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
21333aef
Commit
21333aef
authored
10 years ago
by
Hahn, Steven
Browse files
Options
Downloads
Patches
Plain Diff
Refs #10840. Fix readlink issue
parent
15db93a9
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Code/Mantid/Build/CMake/DarwinSetup.cmake
+8
-4
8 additions, 4 deletions
Code/Mantid/Build/CMake/DarwinSetup.cmake
with
8 additions
and
4 deletions
Code/Mantid/Build/CMake/DarwinSetup.cmake
+
8
−
4
View file @
21333aef
...
@@ -126,13 +126,17 @@ if (OSX_VERSION VERSION_LESS 10.9)
...
@@ -126,13 +126,17 @@ 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
# Follow symlinks
# 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
}
OUTPUT_VARIABLE PYQT4_SYMLINK
)
execute_process
(
COMMAND readlink
${
PYQT4_PATH
}
/Qt.so OUTPUT_VARIABLE PYQT4_SYMLINK_Qtso
)
set
(
PYQT4_PYTHONPATH {PYQT4_PATH}/
${
PYQT_SYMLINK
}
)
string
(
FIND
${
PYQT4_SYMLINK_Qtso
}
"Qt.so"
STOPPOS
)
string
(
SUBSTRING
${
PYQT4_SYMLINK_Qtso
}
0
${
STOPPOS
}
PYQT4_SYMLINK
)
set
(
PYQT4_PYTHONPATH
${
PYQT4_PATH
}
/
${
PYQT4_SYMLINK
}
)
set
(
SITEPACKAGES_PATH /usr/local/lib/python
${
PY_VER
}
/site-packages
)
set
(
SITEPACKAGES_PATH /usr/local/lib/python
${
PY_VER
}
/site-packages
)
execute_process
(
COMMAND readlink
${
SITEPACKAGES_PATH
}
OUTPUT_VARIABLE SITEPACKAGES_SYMLINK
)
execute_process
(
COMMAND readlink
${
SITEPACKAGES_PATH
}
/sip.so OUTPUT_VARIABLE SITEPACKAGES_SYMLINK_sipso
)
string
(
FIND
${
SITEPACKAGES_SYMLINK_sipso
}
"sip.so"
STOPPOS
)
string
(
SUBSTRING
${
SITEPACKAGES_SYMLINK_sipso
}
0
${
STOPPOS
}
SITEPACKAGES_SYMLINK
)
set
(
SITEPACKAGES
${
SITEPACKAGES_PATH
}
/
${
SITEPACKAGES_SYMLINK
}
)
set
(
SITEPACKAGES
${
SITEPACKAGES_PATH
}
/
${
SITEPACKAGES_SYMLINK
}
)
# use homebrew OpenSSL package
# use homebrew OpenSSL package
...
...
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