ENH: reduce reliance on FOAM_EXT_LIBBIN during builds
- just check WM_PROJECT_DIR instead. - provide a fallback value when FOAM_EXT_LIBBIN might actually be needed. Only strictly need FOAM_EXT_LIBBIN for scotch/metis decomposition, and when these are actually supplied by ThirdParty. All other ThirdParty dependencies are referenced by BOOST_ARCH_PATH etc. Can therefore drop the FOAM_EXT_LIBBIN dependency for VTK-related things, which do not use scotch/metis anyhow.
This commit is contained in:
parent
7d048c71be
commit
dd78e042fe
4
Allwmake
4
Allwmake
@ -5,8 +5,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR" 2>/dev/null || {
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
[ -n "$FOAM_EXT_LIBBIN" ] || {
|
||||
echo "Error (${0##*/}) : FOAM_EXT_LIBBIN not set"
|
||||
[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
|
||||
echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
|
@ -5,8 +5,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/applications" 2>/dev/null || {
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
[ -n "$FOAM_EXT_LIBBIN" ] || {
|
||||
echo "Error (${0##*/}) : FOAM_EXT_LIBBIN not set"
|
||||
[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
|
||||
echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
|
@ -22,6 +22,9 @@ fi
|
||||
# Build libccmio (.a|.so) - use static linkage for fewer issues
|
||||
$WM_THIRD_PARTY_DIR/makeCCMIO lib
|
||||
|
||||
: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH} # Extra safety
|
||||
export FOAM_EXT_LIBBIN
|
||||
|
||||
if [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
|
||||
-a \( -e $CCMIO_ARCH_PATH/lib/libccmio.a -o -e $FOAM_EXT_LIBBIN/libccmio.so \) ]
|
||||
then
|
||||
|
@ -28,8 +28,8 @@
|
||||
# Setup file for libccmio include/libraries.
|
||||
# Sourced during wmake process only.
|
||||
#
|
||||
# Dynamic libraries are found under the FOAM_EXT_LIBBIN path.
|
||||
# Static libraries are found under the CCMIO_ARCH_PATH/lib path.
|
||||
# Static libraries (recommended) are found under CCMIO_ARCH_PATH/lib.
|
||||
# Dynamic libraries are found under FOAM_EXT_LIBBIN path.
|
||||
#
|
||||
# Note
|
||||
# A csh version is not needed, since the values here are only sourced
|
||||
|
@ -5,8 +5,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/src" 2>/dev/null || {
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
[ -n "$FOAM_EXT_LIBBIN" ] || {
|
||||
echo "Error (${0##*/}) : FOAM_EXT_LIBBIN not set"
|
||||
[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
|
||||
echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
|
@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Parse arguments for library compilation
|
||||
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
|
||||
|
||||
: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH} # Extra safety
|
||||
export FOAM_EXT_LIBBIN
|
||||
|
||||
export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
|
||||
|
||||
if [ -e "$FOAM_LIBBIN/libMGridGen.so" ]
|
||||
|
@ -4,6 +4,9 @@ cd ${0%/*} || exit 1 # Run from this directory
|
||||
# Parse arguments for library compilation
|
||||
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
|
||||
|
||||
: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH} # Extra safety
|
||||
export FOAM_EXT_LIBBIN
|
||||
|
||||
# Test for metis.
|
||||
# - return 0 and export METIS_ARCH_PATH on success
|
||||
hasMetis()
|
||||
|
Loading…
Reference in New Issue
Block a user