COMP: downgrade error to warning when building run-time post-pro

- although the build is not 100% complete, it is only the run-time
  post-processing with VTK that is affected.

- improve robustness and warning messages

COMP: adjust build order (solvers, utilities)

- as per http://bugs.openfoam.org/view.php?id=2116
This commit is contained in:
Mark Olesen
2016-06-16 19:58:55 +02:00
parent 5ac7a846ed
commit 98e951e8ba
2 changed files with 27 additions and 7 deletions

View File

@ -20,8 +20,8 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
set -x
wmake -all utilities $*
wmake -all solvers $*
wmake -all utilities $*
#------------------------------------------------------------------------------

View File

@ -11,18 +11,38 @@ sourceDir=$PWD
findObjectDir dummy.C
depDir="$objectsDir"
if [ -d "$VTK_DIR" -o -d "$ParaView_DIR" ]
echo
echo "======================================================================"
echo "${PWD##*/} : $PWD"
echo
if [ -d "$VTK_DIR" -o -d "$ParaView_DIR" ]
then
# ensure CMake gets the correct C++ compiler
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
[ -n "$WM_CC" ] && export CC="$WM_CC"
(mkdir -p $depDir && cd $depDir && cmake $sourceDir && make)
if type cmake > /dev/null 2>&1
then
(
mkdir -p $depDir \
&& cd $depDir \
&& cmake $sourceDir \
&& make
) || {
echo
echo "WARNING: incomplete build of VTK-based post-processing"
}
else
echo "WARNING: skipped - needs cmake"
fi
else
echo "ERROR: Build of $PWD requires a valid VTK installation which"
echo " can be supplied either by ParaView by VTK. In case of"
echo " - ParaView : export the ParaView_DIR environment variable"
echo " - VTK : export the VTK_DIR variable"
echo "WARNING: skipped - needs a VTK or a ParaView installation"
echo " - For ParaView : export the 'ParaView_DIR' variable"
echo " - For VTK : export the 'VTK_DIR' variable"
fi
echo "======================================================================"
echo
# ----------------------------------------------------------------- end-of-file