Commit c4c477c4 authored by Mark Olesen's avatar Mark Olesen
Browse files

CONFIG: accept 'system' for foamConfigurePaths -paraview

parent fad754ea
...@@ -63,7 +63,7 @@ Components ...@@ -63,7 +63,7 @@ Components
-scotch-path DIR specify 'SCOTCH_ARCH_PATH' (eg, /opt/scotch_6.0.4) -scotch-path DIR specify 'SCOTCH_ARCH_PATH' (eg, /opt/scotch_6.0.4)
Graphics Graphics
-paraview VER specify 'ParaView_VERSION' (eg, 5.4.1) -paraview VER specify 'ParaView_VERSION' (eg, 5.4.1 or system)
-paraview-qt VER specify 'ParaView_QT' (eg, qt-system) -paraview-qt VER specify 'ParaView_QT' (eg, qt-system)
-paraview-path DIR specify 'ParaView_DIR' (eg, /opt/ParaView-5.4.1) -paraview-path DIR specify 'ParaView_DIR' (eg, /opt/ParaView-5.4.1)
-vtk VER specify 'vtk_version' (eg, VTK-7.1.0) -vtk VER specify 'vtk_version' (eg, VTK-7.1.0)
...@@ -581,11 +581,11 @@ do ...@@ -581,11 +581,11 @@ do
-paraview | -paraviewVersion | --paraviewVersion) -paraview | -paraviewVersion | --paraviewVersion)
# Replace ParaView_VERSION=... # Replace ParaView_VERSION=...
expected="[5-9][.0-9]*" expected="[5-9][.0-9]*" # but also accept system
optionValue=$(getOptionValue "$@") optionValue=$(getOptionValue "$@")
_matches "$optionValue" "$expected" || \ _matches "$optionValue" "$expected" || \
[ "$optionValue" != "${optionValue%system}" ] || \
die "'$1' has bad value: '$optionValue'" die "'$1' has bad value: '$optionValue'"
replace etc/config.sh/paraview ParaView_VERSION "$optionValue" replace etc/config.sh/paraview ParaView_VERSION "$optionValue"
replace etc/config.csh/paraview ParaView_VERSION "$optionValue" replace etc/config.csh/paraview ParaView_VERSION "$optionValue"
adjusted=true adjusted=true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment