Commit 2e3c1fb3 authored by Dave Moxey's avatar Dave Moxey
Browse files

Add patch for OS X libraries, disable rev test for now

parent 88538dcf
...@@ -56,10 +56,10 @@ IF(NEKTAR_USE_MESHGEN) ...@@ -56,10 +56,10 @@ IF(NEKTAR_USE_MESHGEN)
) )
# Patch OS X libraries to fix install name problems. # Patch OS X libraries to fix install name problems.
#EXTERNALPROJECT_ADD_STEP(opencascade-6.9 patch-install-path EXTERNALPROJECT_ADD_STEP(opencascade-6.9 patch-install-path
# COMMAND bash ${CMAKE_SOURCE_DIR}/cmake/scripts/patch-occ.sh ${TPSRC}/opencascade-6.8/i686/lib ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR} COMMAND bash ${CMAKE_SOURCE_DIR}/cmake/scripts/patch-occ.sh ${TPDIST}/lib ${CMAKE_INSTALL_PREFIX}/${NEKTAR_LIB_DIR}
# DEPENDEES build ALWAYS 1
# DEPENDERS install) DEPENDEES install)
MESSAGE(STATUS "Build OpenCascade: ${TPDIST}/lib") MESSAGE(STATUS "Build OpenCascade: ${TPDIST}/lib")
LINK_DIRECTORIES(${TPDIST}/lib) LINK_DIRECTORIES(${TPDIST}/lib)
......
...@@ -6,6 +6,9 @@ install_path=$2 ...@@ -6,6 +6,9 @@ install_path=$2
for file in $path/*.dylib for file in $path/*.dylib
do do
if [ -L $file ]; then
continue
fi
echo Repairing: $file echo Repairing: $file
install_name_tool -id $install_path/`basename $file` $file install_name_tool -id $install_path/`basename $file` $file
DYLIBS=`otool -L $file | grep -v "/" | awk -F' ' '{ print $1 }'` DYLIBS=`otool -L $file | grep -v "/" | awk -F' ' '{ print $1 }'`
......
...@@ -119,8 +119,7 @@ ADD_NEKTAR_TEST_LENGTHY(StarTec/StraightRW) ...@@ -119,8 +119,7 @@ ADD_NEKTAR_TEST_LENGTHY(StarTec/StraightRW)
# MeshGen test # MeshGen test
IF(NEKTAR_USE_MESHGEN) IF(NEKTAR_USE_MESHGEN)
ADD_NEKTAR_TEST (MeshGen/cylinder) ADD_NEKTAR_TEST (MeshGen/cylinder)
ADD_NEKTAR_TEST (MeshGen/sphere) ADD_NEKTAR_TEST (MeshGen/sphere)
ADD_NEKTAR_TEST_LENGTHY (MeshGen/predator) ADD_NEKTAR_TEST_LENGTHY(MeshGen/predator)
ADD_NEKTAR_TEST_LENGTHY (MeshGen/rev)
ENDIF() ENDIF()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment