ENH: streamline handling of static/dynamic libs in detection scripts

This commit is contained in:
Mark Olesen
2019-04-29 10:04:44 +02:00
committed by Andrew Heather
parent beefee48d4
commit 897528da1a
17 changed files with 341 additions and 436 deletions

View File

@ -6,13 +6,13 @@ cd ${0%/*} || exit 1 # Run from this directory
#------------------------------------------------------------------------------
# Only build when the OpenFOAM libccm adaptor already exists
if [ -f $FOAM_LIBBIN/libccm$extLibso ]
if findLibrary "$FOAM_LIBBIN/libccm" > /dev/null
then
echo "==> build optional ccm conversion components"
wmake $targetType ccmToFoam
wmake $targetType foamToCcm
else
echo "==> skip optional ccm conversion components (no libccm$extLibso)"
echo "==> skip optional ccm conversion components (no libccm)"
fi
#------------------------------------------------------------------------------

View File

@ -8,20 +8,17 @@ cd ${0%/*} || exit 1 # Run from this directory
unset COMP_FLAGS LINK_FLAGS
if [ -f $FOAM_LIBBIN/libSloanRenumber$extLibso ]
if findLibrary "$FOAM_LIBBIN/libSloanRenumber" > /dev/null
then
echo " found libSloanRenumber -- enabling sloan renumbering support."
echo " found libSloanRenumber -- enabling sloan renumbering support."
export LINK_FLAGS="$LINK_FLAGS -lSloanRenumber"
fi
if [ -f $FOAM_LIBBIN/libzoltanRenumber$extLibso ]
if findLibrary "$FOAM_LIBBIN/libzoltanRenumber" > /dev/null && have_zoltan
then
if have_zoltan
then
echo " found libzoltanRenumber -- enabling zoltan renumbering support."
export COMP_FLAGS="$COMP_FLAGS -DHAVE_ZOLTAN"
export LINK_FLAGS="$LINK_FLAGS -lzoltanRenumber -L$ZOLTAN_LIB_DIR -lzoltan"
fi
echo " found libzoltanRenumber -- enabling zoltan renumbering support."
export COMP_FLAGS="$COMP_FLAGS -DHAVE_ZOLTAN"
export LINK_FLAGS="$LINK_FLAGS -lzoltanRenumber -L$ZOLTAN_LIB_DIR -lzoltan"
fi
wmake $targetType