mirror of
https://develop.openfoam.com/Development/ThirdParty-common.git
synced 2025-12-08 06:57:50 +00:00
ENH: delay testing of FOAM_EXT_LIBBIN
- only test in the packages that actually require it. State as a requirement. ENH: skip build of packages with known mingw issues - primarily kahip and pt-scotch. Others may also have issues, but for these we tend to use system packages anyhow. ENH: add '-force' option to various scripts - overrides some _lazy_ build logic
This commit is contained in:
32
makeSCOTCH
32
makeSCOTCH
@ -19,8 +19,6 @@
|
||||
#
|
||||
# ----------------------------------------------
|
||||
# NO USER-CONFIGURABLE SETTINGS WITHIN THIS FILE
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Run from third-party directory only
|
||||
cd "${0%/*}" || exit
|
||||
@ -29,11 +27,6 @@ wmakeCheckPwd "$WM_THIRD_PARTY_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"
|
||||
echo " Check your OpenFOAM environment and installation"
|
||||
exit 1
|
||||
}
|
||||
. etc/tools/ThirdPartyFunctions
|
||||
#------------------------------------------------------------------------------
|
||||
_foamConfig scotch # Get SCOTCH_ARCH_PATH, SCOTCH_VERSION
|
||||
@ -53,6 +46,7 @@ usage()
|
||||
Usage: ${0##*/} [OPTION] [libso] [scotch-VERSION]
|
||||
options:
|
||||
-force Force compilation, even if include/library already exists
|
||||
Also force build attempt of pt-scotch (mingw)
|
||||
-gcc Force use of gcc/g++
|
||||
-bin Create scotch binaries as well (experimental)
|
||||
-no-bin Suppress creation of scotch binaries (default)
|
||||
@ -69,6 +63,7 @@ USAGE
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
unset optBinaries optForce
|
||||
|
||||
# Parse options
|
||||
while [ "$#" -gt 0 ]
|
||||
do
|
||||
@ -76,11 +71,11 @@ do
|
||||
'') ;; # Ignore empty
|
||||
-h | -help) usage ;;
|
||||
-gcc) useGcc ;;
|
||||
-force) optForce=true ;;
|
||||
|
||||
-force) optForce=true ;;
|
||||
-bin) optBinaries=true ;;
|
||||
-no-bin) unset optBinaries ;;
|
||||
-no-mpi) unset withMPI ;;
|
||||
-bin) optBinaries=true ;;
|
||||
-no-bin) unset optBinaries ;;
|
||||
-no-mpi) unset withMPI ;;
|
||||
|
||||
scotch-[0-9]* | scotch-git | scotch_* )
|
||||
scotchPACKAGE="${1%%/}"
|
||||
@ -106,6 +101,8 @@ then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
requireExtLibBin
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
# Needs generalizing, but works fairly well
|
||||
@ -230,6 +227,19 @@ then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Known build issues for mingw (MS-MPI source code annotations)
|
||||
case "$WM_COMPILER" in
|
||||
(Mingw*)
|
||||
if [ -z "$optForce" ]
|
||||
then
|
||||
echo "Skipping pt-scotch - known compilation issues with $WM_COMPILER"
|
||||
exit 0
|
||||
else
|
||||
echo "Warning: pt-scotch - known compilation issues with $WM_COMPILER"
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
# Build ptscotch if normal scotch was built (has include and library)
|
||||
# (reuse prefix/include/lib dirs set above)
|
||||
|
||||
Reference in New Issue
Block a user