mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
CONFIG: adjust paraview libs, intelmpi handling
- fix overly aggressive match in the API value - allow `INTELMPI*` generic value, this can be used to specify something like INTELMPI_custom and populate the corresponding wmake rule manually STYLE: mention FOAM_BUILDROOT in wmake -help-full output STYLE: adjust openfoam shell session welcome information - adjust internal variable names to reduce collision potential - improve handling of openfoam -etc=...
This commit is contained in:
@ -437,10 +437,10 @@ case SGIMPI:
|
||||
|
||||
|
||||
# ----
|
||||
# Also support any ending (eg, INTELMPI_custom) to allow custom wmake rules
|
||||
case intelmpi:
|
||||
case intelmpi-[1-9]*:
|
||||
case INTELMPI:
|
||||
case INTELMPI-[1-9]*:
|
||||
case INTELMPI*: ## Also includes (INTELMPI | INTELMPI-[1-9]*)
|
||||
setenv FOAM_MPI intelmpi
|
||||
|
||||
## Add version embedded in the naming
|
||||
|
||||
@ -99,7 +99,7 @@ case "none":
|
||||
breaksw
|
||||
|
||||
case "system":
|
||||
# Obtain major.minor from `paraview --version`
|
||||
# Obtain (major.minor) from `paraview --version`
|
||||
set pv_api=`paraview --version | sed -ne 's/^[^0-9]*\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/p'`
|
||||
|
||||
if ("${pv_api}" == "") then
|
||||
@ -183,7 +183,7 @@ default:
|
||||
set pvLibDir="${libDir}/paraview-${pv_api}"
|
||||
if ( -d "${ParaView_DIR}/${pvLibDir}" ) then
|
||||
switch ("$pv_api")
|
||||
case 5.[0-4]*:
|
||||
case 5.[0-4]:
|
||||
set libDir="$pvLibDir" # Needs lib/paraview-X.X (not lib)
|
||||
breaksw
|
||||
endsw
|
||||
@ -203,8 +203,8 @@ default:
|
||||
|
||||
|
||||
# Any extra library directories
|
||||
if ( -n "$pv_libdirs" != "" ) then
|
||||
switch "WM_ARCH" in
|
||||
if ( "$pv_libdirs" != "" ) then
|
||||
switch ("$WM_ARCH")
|
||||
case darwin*:
|
||||
setenv DYLD_LIBRARY_PATH "${pv_libdirs}:$DYLD_LIBRARY_PATH"
|
||||
breaksw
|
||||
|
||||
Reference in New Issue
Block a user