mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
ENH: improve foamConfigurePaths, remove some antiquated tools
- add edit of llvm/mesa/vtk paths. Reduce some verbosity - include Darwin in foamInstallationTest, foamSystemCheck to avoid a false negative.
This commit is contained in:
@ -22,8 +22,14 @@
|
||||
# LIBEXT if these failed. A DIR ending in "-none" or "-system" is skipped.
|
||||
#
|
||||
# output -csh: setenv LD_LIBRARY_PATH dir/lib:$LD_LIBRARY_PATH
|
||||
# output -make: -Ldir/lib
|
||||
# output -sh: LD_LIBRARY_PATH=dir/lib:$LD_LIBRARY_PATH
|
||||
# output -make: -Ldir/lib
|
||||
#
|
||||
# Note
|
||||
# LD_LIBRARY_PATH automatically changes to DYLD_LIBRARY_PATH for Darwin.
|
||||
#
|
||||
# Environment
|
||||
# WM_COMPILER_LIB_ARCH
|
||||
#
|
||||
#------------------------------------------------------------------------------
|
||||
printHelp() {
|
||||
@ -34,9 +40,9 @@ Usage: ${0##*/} [OPTION] DIR [LIBEXT]
|
||||
options:
|
||||
-sh Emit POSIX shell syntax (default)
|
||||
-csh Emit C-shell shell syntax
|
||||
-sh-verbose As per -sh, with additional verbosity
|
||||
-csh-verbose As per -csh, with additional verbosity
|
||||
-make Emit content for a makefile
|
||||
-sh-verbose Like -sh, with additional verbosity
|
||||
-csh-verbose Like -csh, with additional verbosity
|
||||
-make Emit content for a Makefile
|
||||
-help Print the usage
|
||||
|
||||
Resolves for the existence of DIR/lib64 and DIR/lib, or uses the fallback
|
||||
@ -139,10 +145,10 @@ then
|
||||
# Fallback
|
||||
case "$alt" in
|
||||
/*)
|
||||
resolved=$alt
|
||||
resolved="$alt"
|
||||
;;
|
||||
(*)
|
||||
resolved=$dir/$alt
|
||||
resolved="$dir/$alt"
|
||||
;;
|
||||
esac
|
||||
exit 0
|
||||
@ -177,6 +183,7 @@ then
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
# Default is -sh
|
||||
echo "LD_LIBRARY_PATH=$resolved:$LD_LIBRARY_PATH"
|
||||
if [ -n "$verboseOutput" ]
|
||||
then
|
||||
|
||||
Reference in New Issue
Block a user