ENH: makeVTK -mpi also define VTK_Group_MPI=ON

- this pulls in the other bits (Module_vtkParallelMPI,
  Module_vtkRenderingParallel, ...)

etc/tools/ParaViewFunctions

@@ -137,7 +137,7 @@ addVerbosity()
 
 
 #
-# Define options for mpi support
+# MPI support for PARAVIEW
 #
 addMpiSupport()
 {
@@ -146,7 +146,7 @@ addMpiSupport()
         return
     fi
 
-    addCMakeVariable "PARAVIEW_USE_MPI=ON" "VTK_USE_MPI=ON"
+    addCMakeVariable "PARAVIEW_USE_MPI=ON"
     if [ "${MPI_MAX_PROCS:=0}" -gt 1 ]
     then
         addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
@@ -469,11 +469,11 @@ INFO
     # Non-system installation of QT?
     case "$qtLib" in (/usr/lib | /usr/lib64) unset qtLib ;; esac
 
-    if [ "$qmake" != /usr/bin/qmake -a -d "$qtLib" ]
+    if [ "${qmake%/*}" != /usr/bin -a -d "$qtLib" ]
     then
         /bin/cat<<INFO
 
-And adjust your LD_LIBRARY_PATH to include the following:
+Your LD_LIBRARY_PATH may require adjustment to include the following:
     $qtLib
 INFO
     fi

etc/tools/vtkFunctions

@@ -2,7 +2,7 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2016-2018 OpenCFD Ltd.
 #    \\/     M anipulation  |
 #------------------------------------------------------------------------------
 # License
@@ -148,6 +148,28 @@ configVTK()
 }
 
 
+#
+# MPI support for VTK
+#
+unset -f addMpiSupport 2>/dev/null
+addMpiSupport()
+{
+    if [ "${withMPI:=false}" != true ]
+    then
+        return
+    fi
+
+    addCMakeVariable "VTK_Group_MPI=ON"
+    addCMakeVariable "Module_vtkRenderingParallel=ON"
+    addCMakeVariable "Module_vtkParallelMPI=ON"
+
+    if [ "${MPI_MAX_PROCS:=0}" -gt 1 ]
+    then
+        addCMakeVariable "VTK_MPI_MAX_NUMPROCS=$MPI_MAX_PROCS"
+    fi
+}
+
+
 #
 # Invoke make
 # also link bin/ to lib/paraview-* for development without installation

makeVTK

@@ -71,7 +71,7 @@ options:
   -mesa-include DIR location of mesa headers (current: ${MESA_INCLUDE:-none})
   -mesa-lib PATH    path to mesa library     (current: ${MESA_LIBRARY:-none})
   -osmesa           with off-screen mesa only
-  -mpi              with mpi
+  -mpi              with mpi (VTK_Group_MPI=ON)
   -mpi=N            with max 'N' mpi processes. N=0 for no upper-limit.
   -cmake PATH       with cmake from the path given
   -verbose          verbose output in Makefiles

makeVTK.example

@@ -7,24 +7,17 @@ vtk=VTK-9.0.0
 # mesa=mesa-13.0.3
 mesa=mesa-17.1.1
 
-# Request building MPI modules
+# Module_vtkAcceleratorsVTKm    : Request building vtkAcceleratorsVTKm
-# VTK_Group_MPI=ON
 #
-# Request building vtkAcceleratorsVTKm
+# -mpi implies VTK_Group_MPI    : Request building MPI modules
-# Module_vtkAcceleratorsVTKm=OFF
-#
-# Request building vtkParallelMPI
-# Module_vtkParallelMPI=ON
 
 set -x
 ./makeVTK \
-    -mpi=0 \
+    -mpi  \
     -osmesa \
     -mesa-prefix $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$mesa \
     $vtk "$@" \
-    VTK_Group_MPI=ON \
+    Module_vtkAcceleratorsVTKm=ON
-    Module_vtkAcceleratorsVTKm=ON \
-    Module_vtkParallelMPI=ON
 
 
 #------------------------------------------------------------------------------