COMP: adjust make scripts for systems with .dylib instead of .so

This commit is contained in:
Mark Olesen
2018-04-11 16:12:29 +02:00
parent 455551b48b
commit 6d7ef8dc42
9 changed files with 71 additions and 42 deletions

View File

@ -19,6 +19,9 @@
# ----------------------------------------------
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
#------------------------------------------------------------------------------
# Dynamic library endings (default is .so)
[ "$(uname -s)" = Darwin ] && SO=dylib || SO=so
# Short-circuit test for an installation
if [ "$1" = "-test" ]
then
@ -27,11 +30,11 @@ then
if [ -d "$dir/include" ]
then
for lib in \
$FOAM_EXT_LIBBIN/libmetis.so \
$FOAM_EXT_LIBBIN/libmetis.$SO \
$dir/lib/libmetis.a \
$dir/lib/libmetis.so \
$dir/lib/libmetis.$SO \
$dir/lib$WM_COMPILER_LIB_ARCH/libmetis.a \
$dir/lib$WM_COMPILER_LIB_ARCH/libmetis.so \
$dir/lib$WM_COMPILER_LIB_ARCH/libmetis.$SO \
;
do
if [ -r "$lib" ]
@ -143,10 +146,10 @@ install()
if [ "$targetType" = libso ]
then
\mv $libdir/libmetis.so $FOAM_EXT_LIBBIN
\mv $libdir/libmetis.$SO $FOAM_EXT_LIBBIN
rmdir $libdir 2>/dev/null # Failed rmdir is uncritical
echo "Installing: $FOAM_EXT_LIBBIN/libmetis.so"
echo "Installing: $FOAM_EXT_LIBBIN/libmetis.$SO"
fi
return 0
}
@ -165,7 +168,7 @@ echo
export GIT_DIR=$PWD/.git # Mask seeing our own git-repo
rm -rf $METIS_ARCH_PATH
rm -f $FOAM_EXT_LIBBIN/libmetis.so
rm -f $FOAM_EXT_LIBBIN/libmetis.$SO
# Adjust metis integer size to match OpenFOAM label-size
sed -i -e 's=\(#define IDXTYPEWIDTH\).*=\1 '$WM_LABEL_SIZE'=' \