Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Nektar
Nektar
Commits
2e3c1fb3
Commit
2e3c1fb3
authored
Jul 20, 2016
by
Dave Moxey
Browse files
Add patch for OS X libraries, disable rev test for now
parent
88538dcf
Changes
3
Hide whitespace changes
Inline
Side-by-side
cmake/ThirdPartyOCC.cmake
View file @
2e3c1fb3
...
...
@@ -56,10 +56,10 @@ IF(NEKTAR_USE_MESHGEN)
)
# Patch OS X libraries to fix install name problems.
#
EXTERNALPROJECT_ADD_STEP(opencascade-6.9 patch-install-path
#
COMMAND bash ${CMAKE_SOURCE_DIR}/cmake/scripts/patch-occ.sh ${TP
SRC}/opencascade-6.8/i686
/lib ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}
#
DEPENDEES build
#
DEPENDE
R
S install)
EXTERNALPROJECT_ADD_STEP
(
opencascade-6.9 patch-install-path
COMMAND bash
${
CMAKE_SOURCE_DIR
}
/cmake/scripts/patch-occ.sh
${
TP
DIST
}
/lib
${
CMAKE_INSTALL_PREFIX
}
/
${
NEKTAR_LIB_DIR
}
ALWAYS 1
DEPENDE
E
S install
)
MESSAGE
(
STATUS
"Build OpenCascade:
${
TPDIST
}
/lib"
)
LINK_DIRECTORIES
(
${
TPDIST
}
/lib
)
...
...
cmake/scripts/patch-occ.sh
View file @
2e3c1fb3
...
...
@@ -6,6 +6,9 @@ install_path=$2
for
file
in
$path
/
*
.dylib
do
if
[
-L
$file
]
;
then
continue
fi
echo
Repairing:
$file
install_name_tool
-id
$install_path
/
`
basename
$file
`
$file
DYLIBS
=
`
otool
-L
$file
|
grep
-v
"/"
|
awk
-F
' '
'{ print $1 }'
`
...
...
utilities/NekMesh/CMakeLists.txt
View file @
2e3c1fb3
...
...
@@ -119,8 +119,7 @@ ADD_NEKTAR_TEST_LENGTHY(StarTec/StraightRW)
# MeshGen test
IF
(
NEKTAR_USE_MESHGEN
)
ADD_NEKTAR_TEST
(
MeshGen/cylinder
)
ADD_NEKTAR_TEST
(
MeshGen/sphere
)
ADD_NEKTAR_TEST_LENGTHY
(
MeshGen/predator
)
ADD_NEKTAR_TEST_LENGTHY
(
MeshGen/rev
)
ADD_NEKTAR_TEST
(
MeshGen/cylinder
)
ADD_NEKTAR_TEST
(
MeshGen/sphere
)
ADD_NEKTAR_TEST_LENGTHY
(
MeshGen/predator
)
ENDIF
()
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment