From 78d0ccc78dca8814f6b668b391d55e9ec9886b71 Mon Sep 17 00:00:00 2001
From: Martin Beaudoin <beaudoin.martin@gmail.com>
Date: Fri, 15 May 2015 08:48:09 -0400
Subject: [PATCH] ThirdParty: initial commit of the packages selection
 mechanism using environment variables

---
 ThirdParty/AllMake.stage1                     | 133 ++++++++++++------
 ThirdParty/AllMake.stage2                     |  45 +++++-
 ThirdParty/AllMake.stage3                     |  92 +++++++++---
 ThirdParty/AllMake.stage4                     |  71 ++++++++--
 ThirdParty/AllMake.stage5                     |   1 +
 ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec |  22 +--
 ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec      |  57 ++++++--
 ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec  |  23 ++-
 .../qt-everywhere-opensource-src-4.8.5.spec   |   2 +-
 .../qt-everywhere-opensource-src-4.8.6.spec   |   4 +-
 etc/bashrc                                    |  27 ++++
 etc/cshrc                                     |  27 ++++
 etc/prefs.csh-EXAMPLE                         |  46 ++++++
 etc/prefs.sh-EXAMPLE                          |  52 +++++++
 etc/settings.csh                              |  99 ++++++++-----
 etc/settings.sh                               |  92 ++++++++----
 16 files changed, 621 insertions(+), 172 deletions(-)

diff --git a/ThirdParty/AllMake.stage1 b/ThirdParty/AllMake.stage1
index 2acd5e86b..46dd4bd4d 100755
--- a/ThirdParty/AllMake.stage1
+++ b/ThirdParty/AllMake.stage1
@@ -38,9 +38,10 @@
 #
 # Requirements:
 #     1: Your foam-extend environment must be properly initialized
-#
+#     2: The file etc/prefs.sh should be used for setting the variables enabling
+#        the compilation of the various packages
 # Author:
-#     Martin Beaudoin, Hydro-Quebec, (2010)
+#     Martin Beaudoin, Hydro-Quebec, (2015)
 #
 #------------------------------------------------------------------------------
 # run from third-party directory only
@@ -60,53 +61,99 @@ echo Starting ThirdParty AllMake: Stage1
 echo ========================================
 echo
 
-# Gcc and companion libraries
-#
-# Uncomment the following 4 lines for gcc-4.9.2. You need gmp, mpfr and mpc for gcc-4.9.2
-#( rpm_make -p gmp-5.1.2  -s gmp-5.1.2.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2                 )
-#( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz                )
-#( rpm_make -p mpc-1.0.1  -s mpc-1.0.1.spec  -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz )
-#( rpm_make -p gcc-4.9.2  -s gcc-4.9.2.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.gz        )
-#
-# Uncomment the following 4 lines for gcc-4.7.4. You need gmp, mpfr and mpc for gcc-4.7.4
-#( rpm_make -p gmp-5.1.2  -s gmp-5.1.2.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2                 )
-#( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz                )
-#( rpm_make -p mpc-1.0.1  -s mpc-1.0.1.spec  -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz )
-#( rpm_make -p gcc-4.7.4  -s gcc-4.7.4.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.7.4/gcc-4.7.4.tar.gz        )
-#
-# Uncomment the following 4 lines for gcc-4.6.4. You need gmp, mpfr and mpc for gcc-4.6.4
-#( rpm_make -p gmp-5.1.2  -s gmp-5.1.2.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.1.2.tar.bz2                 )
-#( rpm_make -p mpfr-3.1.2 -s mpfr-3.1.2.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.2.tar.gz                )
-#( rpm_make -p mpc-1.0.1  -s mpc-1.0.1.spec  -u http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz )
-#( rpm_make -p gcc-4.6.4  -s gcc-4.6.4.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.4/gcc-4.6.4.tar.gz        )
-#
-# Uncomment the following 4 lines for gcc-4.5.1. You need gmp, mpfr and mpc for gcc-4.5.1
-#( rpm_make -p gmp-5.0.1  -s gmp-5.0.1.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz                  )
-#( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz                )
-#( rpm_make -p mpc-0.8.2  -s mpc-0.8.2.spec  -u http://www.multiprecision.org/mpc/download/mpc-0.8.2.tar.gz )
-#( rpm_make -p gcc-4.5.1  -s gcc-4.5.1.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.gz        )
-#
-# Uncomment the following 3 lines for gcc-4.4.5. You need gmp and mpfr for gcc-4.4.5
-#( rpm_make -p gmp-5.0.1   -s gmp-5.0.1.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz                  )
-#( rpm_make -p mpfr-3.0.1  -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz                )
-#( rpm_make -p gcc-4.4.5   -s gcc-4.4.5.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.gz        )
+# Gcc 4.4.5 and companion libraries
 #
+[ ! -z "$WM_THIRD_PARTY_USE_GCC_445" ] && {
+    echo "Building gmp-5.0.1 mpfr-3.0.1 gcc-4.4.5"
+    ( rpm_make -p gmp-5.0.1   -s gmp-5.0.1.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz                  )
+    ( rpm_make -p mpfr-3.0.1  -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz                )
+    ( rpm_make -p gcc-4.4.5   -s gcc-4.4.5.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.4.5/gcc-4.4.5.tar.gz        )
+}
 
-# Python
-#( rpm_make -p Python-2.7  -s Python-2.7.spec -u http://www.python.org/ftp/python/2.7/Python-2.7.tgz        )
+# Gcc 4.5.1 and companion libraries
+#
+[ ! -z "$WM_THIRD_PARTY_USE_GCC_451" ] && {
+    echo "Building gmp-5.0.1 mpfr-3.0.1 mpc-0.8.2 gcc-4.5.1"
+    ( rpm_make -p gmp-5.0.1  -s gmp-5.0.1.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.1.tar.gz                  )
+    ( rpm_make -p mpfr-3.0.1 -s mpfr-3.0.1.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.0.1.tar.gz                )
+    ( rpm_make -p mpc-0.8.2  -s mpc-0.8.2.spec  -u http://www.multiprecision.org/mpc/download/mpc-0.8.2.tar.gz )
+    ( rpm_make -p gcc-4.5.1  -s gcc-4.5.1.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.5.1/gcc-4.5.1.tar.gz        )
+}
 
-# m4
-# You need a recent version of m4 in order to compile a recent version of bison
-#( rpm_make -p m4-1.4.16  -s m4-1.4.16.spec   -u http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz               )
+# Gcc 4.6.3 and companion libraries
+#
+[ ! -z "$WM_THIRD_PARTY_USE_GCC_463" ] && {
+    echo "Building gmp-5.0.5 mpfr-3.1.0 mpc-0.9 gcc-4.6.3"
+    ( rpm_make -p gmp-5.0.5  -s gmp-5.0.5.spec  -u ftp://ftp.gnu.org/gnu/gmp/gmp-5.0.5.tar.bz2                 )
+    ( rpm_make -p mpfr-3.1.0 -s mpfr-3.1.0.spec -u ftp://ftp.gnu.org/gnu/mpfr/mpfr-3.1.0.tar.gz                )
+    ( rpm_make -p mpc-0.9    -s mpc-0.9.spec    -u http://www.multiprecision.org/mpc/download/mpc-0.9.tar.gz   )
+    ( rpm_make -p gcc-4.6.3  -s gcc-4.6.3.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.6.3/gcc-4.6.3.tar.gz        )
+}
 
-# bison
-( rpm_make -p bison-2.7 -s bison-2.7.spec -u http://ftp.gnu.org/gnu/bison/bison-2.7.tar.gz           )
+# Gcc 4.8.4 and companion libraries
+#
+[ ! -z "$WM_THIRD_PARTY_USE_GCC_484" ] && {
+    echo "Building gcc-4.8.4"
+    ( rpm_make -p gcc-4.8.4  -s gcc-4.8.4.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.8.4/gcc-4.8.4.tar.gz      )
+}
 
-# flex
-#( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz )
+# Gcc 4.9.2 and companion libraries
+#
+[ ! -z "$WM_THIRD_PARTY_USE_GCC_492" ] && {
+    echo "Building gcc-4.9.2"
+    ( rpm_make -p gcc-4.9.2  -s gcc-4.9.2.spec  -u ftp://ftp.gnu.org/gnu/gcc/gcc-4.9.2/gcc-4.9.2.tar.gz      )
+}
 
-# cmake
-#( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz        )
+# Clang 3.6.0
+#
+[ ! -z "$WM_THIRD_PARTY_USE_LLVM_360" ] && {
+    echo "Building llvm and clang 3.6.0"
+    ( rpm_make -p llvm-3.6.0 -s llvm-3.6.0.spec -u http://llvm.org/releases/3.6.0/llvm-3.6.0.src.tar.xz    )
+}
+
+# Python 2.7
+#
+[ ! -z "$WM_THIRD_PARTY_USE_PYTHON_27" ] && {
+    echo "Building python 2.7"
+    ( rpm_make -p Python-2.7  -s Python-2.7.spec -u http://www.python.org/ftp/python/2.7/Python-2.7.tgz        )
+}
+
+# m4 1.4.16
+#
+[ ! -z "$WM_THIRD_PARTY_USE_M4_146" ] && {
+    echo "Building m4 1.4.16"
+    # You need a recent version of m4 in order to compile a recent version of bison
+    ( rpm_make -p m4-1.4.16  -s m4-1.4.16.spec   -u http://ftp.gnu.org/gnu/m4/m4-1.4.16.tar.gz               )
+}
+
+# bison 2.7
+#
+[ ! -z "$WM_THIRD_PARTY_USE_BISON_27" ] && {
+    echo "Building bison 2.7"
+    # You need a recent version of m4 in order to compile a recent version of bison
+    ( rpm_make -p bison-2.7 -s bison-2.7.spec -u http://ftp.gnu.org/gnu/bison/bison-2.7.tar.gz           )
+}
+
+# flex 2.5.35
+#
+[ ! -z "$WM_THIRD_PARTY_USE_FLEX_2535" ] && {
+    echo "Building flex 2.5.35"
+    ( rpm_make -p flex-2.5.35 -s flex-2.5.35.spec -u http://downloads.sourceforge.net/project/flex/flex/flex-2.5.35/flex-2.5.35.tar.gz )
+}
+
+# cmake 2.8.12
+#
+[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_2812" ] && {
+    echo "Building cmake 2.8.12"
+    ( rpm_make -p cmake-2.8.12 -s cmake-2.8.12.spec -u http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz        )
+}
+
+# cmake 3.1.1
+#
+[ ! -z "$WM_THIRD_PARTY_USE_CMAKE_311" ] && {
+    echo "Building cmake 3.1.1"
+    ( rpm_make -p cmake-3.1.1 -s cmake-3.1.1.spec -u http://www.cmake.org/files/v3.1/cmake-3.1.1.tar.gz        )
+}
 
 echo ========================================
 echo Done ThirdParty AllMake: Stage1
diff --git a/ThirdParty/AllMake.stage2 b/ThirdParty/AllMake.stage2
index 5e76b44a4..f51b3d97a 100755
--- a/ThirdParty/AllMake.stage2
+++ b/ThirdParty/AllMake.stage2
@@ -40,9 +40,11 @@
 # Requirements:
 #     1: Your foam-extend environment must be properly initialized
 #     2: AllMake.stage1 if you are overriding your system compiler
+#     3: The file etc/prefs.sh should be used for setting the variables enabling
+#        the compilation of the various packages
 #
 # Author:
-#     Martin Beaudoin, Hydro-Quebec, (2010)
+#     Martin Beaudoin, Hydro-Quebec, (2015)
 # 
 #------------------------------------------------------------------------------
 # run from third-party directory only
@@ -65,10 +67,43 @@ echo
 if [ "$WM_MPLIB" != "SYSTEMOPENMPI" ]
 then
     # MPI
-    #( rpm_make -p openmpi-1.4.1 -s openmpi-1.4.1.spec  -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.1.tar.gz )
-    #( rpm_make -p openmpi-1.5   -s openmpi-1.5.spec    -u http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.tar.gz   )
-    #( rpm_make -p openmpi-1.4.3 -s openmpi-1.4.3.spec  -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.gz )
-     ( rpm_make -p openmpi-1.6.5 -s openmpi-1.6.5.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/openmpi-1.6.5.tar.gz )
+
+    # openmpi 1.4.1
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_141" ] && {
+	echo "Building openmpi 1.4.1"
+	( rpm_make -p openmpi-1.4.1 -s openmpi-1.4.1.spec  -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.1.tar.gz )
+    }
+
+    # openmpi 1.4.3
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_143" ] && {
+	echo "Building openmpi 1.4.3"
+	( rpm_make -p openmpi-1.4.3 -s openmpi-1.4.3.spec  -u http://www.open-mpi.org/software/ompi/v1.4/downloads/openmpi-1.4.3.tar.gz )
+    }
+
+    # openmpi 1.5
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_15" ] && {
+	echo "Building openmpi 1.5"
+	( rpm_make -p openmpi-1.5   -s openmpi-1.5.spec    -u http://www.open-mpi.org/software/ompi/v1.5/downloads/openmpi-1.5.tar.gz   )
+    }
+
+    # openmpi 1.6.5
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_165" ] && {
+	echo "Building openmpi 1.6.5"
+	( rpm_make -p openmpi-1.6.5 -s openmpi-1.6.5.spec  -u http://www.open-mpi.org/software/ompi/v1.6/downloads/openmpi-1.6.5.tar.gz \
+          -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"')
+    }
+
+    # openmpi 1.8.4
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_OPENMPI_1*$" ] && {
+	echo "Building openmpi 1.8.4"
+	( rpm_make -p openmpi-1.8.4 -s openmpi-1.8.4.spec  -u http://www.open-mpi.org/software/ompi/v1.8/downloads/openmpi-1.8.4.tar.gz \
+          -f --define '_configureAdditionalArgs "$WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs"')
+    }
 else
     echo "Using system installed OpenMPI"
     echo ""
diff --git a/ThirdParty/AllMake.stage3 b/ThirdParty/AllMake.stage3
index 3f724ad65..dd4146cd4 100755
--- a/ThirdParty/AllMake.stage3
+++ b/ThirdParty/AllMake.stage3
@@ -36,7 +36,7 @@
 #     3: AllMake.stage2 if you are overriding your system comm. libraries
 #
 # Author:
-#     Martin Beaudoin, Hydro-Quebec, (2010)
+#     Martin Beaudoin, Hydro-Quebec, (2015)
 #
 #------------------------------------------------------------------------------
 # run from third-party directory only
@@ -59,7 +59,12 @@ echo
 # Metis
 if [ -z "$METIS_SYSTEM" ]
 then
-    ( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/metis-5.1.0.tar.gz )
+    # metis 5.1.0
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_METIS_510" ] && {
+	echo "Building metis 5.1.0"
+	( rpm_make -p metis-5.1.0 -s metis-5.1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/metis-5.1.0.tar.gz )
+    }
 else
     echo "Using system installed Metis"
     echo ""
@@ -68,8 +73,13 @@ fi
 # ParMGridGen
 if [ -z "$PARMGRIDGEN_SYSTEM" ]
 then
-    #( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz       )
-    ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParMGridGen-1.0.tar.gz )
+    # ParMGridGen 1.0
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_PARMGRIDGEN_10" ] && {
+	echo "Building ParMGridGen 1.0"
+        ( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://www.mgnet.org/mgnet/Codes/parmgridgen/ParMGridGen-1.0.tar.gz       )
+	#( rpm_make -p ParMGridGen-1.0 -s ParMGridGen-1.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParMGridGen-1.0.tar.gz )
+    }
 else
     echo "Using system installed ParMGridGen"
     echo ""
@@ -78,7 +88,12 @@ fi
 # Libccmio
 if [ -z "$LIBCCMIO_SYSTEM" ]
 then
-    ( rpm_make -p libccmio-2.6.1 -s libccmio-2.6.1.spec -u http://portal.nersc.gov/svn/visit/tags/2.4.2/third_party/libccmio-2.6.1.tar.gz )
+    # Libccmio 2.6.1
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_LIBCCMIO_261" ] && {
+	echo "Building Libccmio 2.6.1"
+	( rpm_make -p libccmio-2.6.1 -s libccmio-2.6.1.spec -u http://portal.nersc.gov/svn/visit/tags/2.4.2/third_party/libccmio-2.6.1.tar.gz )
+    }
 else
     echo "Using system installed Libccmio"
     echo ""
@@ -87,7 +102,12 @@ fi
 # Mesquite
 if [ -z "$MESQUITE_SYSTEM" ]
 then
-    ( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/mesquite-2.1.2.tar.gz )
+    # Mesquite 2.1.2
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_MESQUITE_212" ] && {
+	echo "Building Mesquite 2.1.2"
+	( rpm_make -p mesquite-2.1.2 -s mesquite-2.1.2.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/mesquite-2.1.2.tar.gz )
+    }
 else
     echo "Using system installed Mesquite"
     echo ""
@@ -102,7 +122,12 @@ fi
 # Scotch
 if [ -z "$SCOTCH_SYSTEM" ]
 then
-    ( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch-6.0.0.tar.gz )
+    # Scotch 6.0.0
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_SCOTCH_600" ] && {
+	echo "Building Scotch 6.0.0"
+	( rpm_make -p scotch-6.0.0 -s scotch-6.0.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/scotch-6.0.0.tar.gz )
+    }
 else
     echo "Using system installed Scotch"
     echo ""
@@ -111,30 +136,46 @@ fi
 # ParMetis
 if [ -z "$PARMETIS_SYSTEM" ]
 then
-    ( rpm_make -p parmetis-4.0.3 -s parmetis-4.0.3.spec -u http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz )
+    # ParMetis 4.0.3
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_PARMETIS_403" ] && {
+	echo "Building ParMetis 4.0.3"
+	( rpm_make -p parmetis-4.0.3 -s parmetis-4.0.3.spec -u http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz )
+    }
 else
     echo "Using system installed ParMetis"
     echo ""
 fi
 
-## Zoltan
-#if [ -z "$ZOLTAN_SYSTEM" ]
-#then
-#    ( rpm_make -p zoltan-3.6 -s zoltan-3.6.spec -u http://www.cs.sandia.gov/~kddevin/Zoltan_Distributions/zoltan_distrib_v3.6.tar.gz )
-#else
-#    echo "Using system installed Zoltan"
-#    echo ""
-#fi
+# Zoltan
+if [ -z "$ZOLTAN_SYSTEM" ]
+then
+    # Zoltan 3.6
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_ZOLTAN_36" ] && {
+	echo "Building Zoltan 3.6"
+	( rpm_make -p zoltan-3.6 -s zoltan-3.6.spec -u http://www.cs.sandia.gov/~kddevin/Zoltan_Distributions/zoltan_distrib_v3.6.tar.gz )
+    }
+else
+    echo "Using system installed Zoltan"
+    echo ""
+fi
 
 # PyFoam
 if [ -z "$PYFOAM_SYSTEM" ]
 then
-#   ( rpm_make -p PyFoam-0.5.6 -s PyFoam-0.5.6.spec  -u http://openfoamwiki.net/images/b/b8/PyFoam-0.5.6.tar.gz -n PyFoam-0.5.6-1.noarch -a noarch)
-#   ( rpm_make -p PyFoam-0.5.7 -s PyFoam-0.5.7.spec  -u http://openfoamwiki.net/images/d/dc/PyFoam-0.5.7.tar.gz -n PyFoam-0.5.7-1.noarch -a noarch)
-#   ( rpm_make -p PyFoam-0.6.1 -s PyFoam-0.6.1.spec  -u http://openfoamwiki.net/images/3/33/PyFoam-0.6.1.tar.gz -n PyFoam-0.6.1-1.noarch -a noarch)
-#   ( rpm_make -p PyFoam-0.6.2 -s PyFoam-0.6.2.spec  -u http://openfoamwiki.net/images/8/89/PyFoam-0.6.2.tar.gz -n PyFoam-0.6.2-1.noarch -a noarch)
-#    ( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/PyFoam-0.6.1.tar.gz )
-    ( rpm_make -p PyFoam-0.6.4 -s PyFoam-0.6.4.spec  -u http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.tar.gz -n PyFoam-0.6.4-1.noarch  -a noarch )
+    # PyFoam 0.6.3
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_PYFOAM_063" ] && {
+	echo "Building PyFoam 0.6.3"
+	( rpm_make -p PyFoam-0.6.3 -s PyFoam-0.6.3.spec  -u http://openfoamwiki.net/images/c/cb/PyFoam-0.6.3.tar.gz -n PyFoam-0.6.3-1.noarch -a noarch)
+    }
+    # PyFoam 0.6.4
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_PYFOAM_064" ] && {
+	echo "Building PyFoam 0.6.4"
+	( rpm_make -p PyFoam-0.6.4 -s PyFoam-0.6.4.spec  -u http://openfoamwiki.net/images/3/3b/PyFoam-0.6.4.tar.gz -n PyFoam-0.6.4-1.noarch -a noarch)
+    }
 else
     echo "Using system installed PyFoam"
     echo ""
@@ -143,7 +184,12 @@ fi
 # hwloc
 if [ -z "$HWLOC_SYSTEM" ]
 then
-    ( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.7.2.tar.gz )
+    # hwloc 1.7.2
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_HWLOC_172" ] && {
+	echo "Building hwloc 1.7.2"
+	( rpm_make -p hwloc-1.7.2 -s hwloc-1.7.2.spec  -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/hwloc-1.7.2.tar.gz )
+    }
 else
     echo "Using system installed hwloc"
     echo ""
diff --git a/ThirdParty/AllMake.stage4 b/ThirdParty/AllMake.stage4
index 2d0e77a37..884ec6589 100755
--- a/ThirdParty/AllMake.stage4
+++ b/ThirdParty/AllMake.stage4
@@ -36,7 +36,7 @@
 #     3: AllMake.stage2 if you are overriding your system comm. libraries
 #
 # Author:
-#     Martin Beaudoin, Hydro-Quebec, (2010)
+#     Martin Beaudoin, Hydro-Quebec, (2015)
 #
 #------------------------------------------------------------------------------
 # run from third-party directory only
@@ -59,7 +59,12 @@ echo
 # qt-everywhere-opensource-src-4.8.6
 if [ ! -z "$QT_THIRD_PARTY" ]
 then
-    ( rpm_make -p qt-everywhere-opensource-src-4.8.6 -s qt-everywhere-opensource-src-4.8.6.spec -u http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz )
+    # Qt 4.8.6
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_QT_486" ] && {
+	echo "Building Qt 4.8.6"
+	( rpm_make -p qt-everywhere-opensource-src-4.8.6 -s qt-everywhere-opensource-src-4.8.6.spec -u http://download.qt.io/archive/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz )
+    }
 else
     echo "Using system installed QT"
     echo ""
@@ -73,16 +78,33 @@ then
 
     if [ -d "$QT_BIN_DIR" -a -r "$QT_BIN_DIR"/qmake ]
     then
-        ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \
-            -f --define='_qmakePath $QT_BIN_DIR/qmake'
-#        ( rpm_make -p ParaView-4.2.0 -s ParaView-4.2.0.spec -u http://www.paraview.org/files/v4.2/ParaView-v4.2.0-source.tar.gz \
-#            -f --define='_qmakePath $QT_BIN_DIR/qmake'
-#        ( rpm_make -p ParaView-4.2.0 -s ParaView-4.2.0.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.2.0-source.tgz \
-#            -f --define='_qmakePath $QT_BIN_DIR/qmake'
-        )
+        # ParaView 4.0.1
+        #
+	[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_401" ] && {
+	    echo "Building ParaView 4.0.1"
+            ( rpm_make -p ParaView-4.0.1 -s ParaView-4.0.1.spec -u http://downloads.sourceforge.net/project/openfoam-extend/foam-extend-3.1/ThirdParty/ParaView-v4.0.1-source.tgz \
+		-f --define='_qmakePath $QT_BIN_DIR/qmake'
+            )
+	}
+        # ParaView 4.1.0
+        #
+	[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_410" ] && {
+	    echo "Building ParaView 4.1.0"
+            ( rpm_make -p ParaView-4.1.0 -s ParaView-4.1.0.spec -u http://www.paraview.org/files/v4.1/ParaView-v4.1.0-source.tar.gz \
+		-f --define='_qmakePath $QT_BIN_DIR/qmake'
+            )
+	}
+        # ParaView 4.3.1
+        #
+	[ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_431" ] && {
+	    echo "Building ParaView 4.3.1"
+            ( rpm_make -p ParaView-4.3.1 -s ParaView-4.3.1.spec -u http://www.paraview.org/files/v4.3/ParaView-v4.3.1-source.tar.gz \
+		-f --define='_qmakePath $QT_BIN_DIR/qmake'
+            )
+	}
     else
         echo "WARNING: "
-        echo "WARNING: Skipping the installation of ParaView-4.2.0."
+        echo "WARNING: Skipping the installation of ParaView-4.x.x."
         echo "WARNING: Please make sure the QT_BIN_DIR environment variable properly"
         echo "WARNING: initialized in the file prefs.sh or prefs.csh"
         echo "WARNING: The command \$QT_BIN_DIR/qmake needs to be valid"
@@ -93,6 +115,35 @@ else
     echo ""
 fi
 
+# ParaView Server
+if [ -z "$PARAVIEW_SERVER_THIRD_PARTY" ]
+then
+    # ParaView 4.1.0: Server-only
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_SERVER_410" ] && {
+	echo "Building ParaView Server 4.1.0"
+	( rpm_make -p llvm-3.6.0 -s llvm-3.6.0.spec -u http://llvm.org/releases/3.6.0/llvm-3.6.0.src.tar.xz )
+	( rpm_make -p mesa-git -s mesa-git.spec -u ftp://ftp.freedesktop.org/pub/mesa/10.5.3/mesa-10.5.3.tar.gz )
+	( rpm_make -p ParaView-4.1.0_Server -s ParaView-4.1.0_Server.spec -u http://www.paraview.org/files/v4.1/ParaView-v4.1.0-source.tar.gz  \
+		-f --define='_qmakePath $QT_BIN_DIR/qmake'
+	)
+    }
+    # ParaView 4.3.1: Server-only
+    #
+    [ ! -z "$WM_THIRD_PARTY_USE_PARAVIEW_SERVER_431" ] && {
+	echo "Building ParaView Server 4.3.1"
+	( rpm_make -p llvm-3.6.0 -s llvm-3.6.0.spec -u http://llvm.org/releases/3.6.0/llvm-3.6.0.src.tar.xz )
+	( rpm_make -p mesa-git -s mesa-git.spec -u ftp://ftp.freedesktop.org/pub/mesa/10.5.3/mesa-10.5.3.tar.gz )
+	( rpm_make -p ParaView-4.3.1_Server -s ParaView-4.3.1_Server.spec -u http://www.paraview.org/files/v4.3/ParaView-v4.3.1-source.tar.gz  \
+		-f --define='_qmakePath $QT_BIN_DIR/qmake'
+	)
+    }
+else
+    echo "Using system installed ParaView Server"
+    echo ""
+fi
+
+
 echo ========================================
 echo Done ThirdParty AllMake: Stage4
 echo ========================================
diff --git a/ThirdParty/AllMake.stage5 b/ThirdParty/AllMake.stage5
index ac52d67b6..0d86392f2 100755
--- a/ThirdParty/AllMake.stage5
+++ b/ThirdParty/AllMake.stage5
@@ -55,6 +55,7 @@ echo "Starting ThirdParty AllMake: Stage5     "
 echo "========================================"
 echo
 
+# swak4Foam - Version 0.3.1
 # swak4Foam - Version 0.3.2
 # In fact, we are basically tracking the head branch from the Mercurial repository
 # which is also replicated under the Breeder_2.0 section of the Subversion repository
diff --git a/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec b/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec
index e10f71f5b..4bf41924a 100644
--- a/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec
+++ b/ThirdParty/rpmBuild/SPECS/ParaView-4.3.1.spec
@@ -77,7 +77,7 @@ URL:                    http://www.paraview.org/files/v4.3/
 Source: 		%url/%{name}-v%{version}-source.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
-Patch0:                 paraview-4.3.1.patch_darwin
+Patch0:                 ParaView-4.3.1.patch_darwin
 
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 
@@ -145,16 +145,16 @@ Patch0:                 paraview-4.3.1.patch_darwin
     set -x
 
     # start with these general settings
-    addCMakeVariable  VTK_USE_TK:BOOL=OFF
-    addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON  VTK_USE_RPATH:BOOL=OFF
+    addCMakeVariable  BUILD_SHARED_LIBS:BOOL=ON
     addCMakeVariable  CMAKE_BUILD_TYPE:STRING=Release
+    addCMakeVariable  BUILD_TESTING:BOOL=OFF
+
+    # We build with Python. This is ust too useful
+    addCMakeVariable  PARAVIEW_ENABLE_PYTHON:BOOL=ON
 
     # include development files in "make install"
     addCMakeVariable  PARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=ON
 
-    # new alternative to "make HTMLDocumentation"
-    addCMakeVariable  PARAVIEW_GENERATE_PROXY_DOCUMENTATION:BOOL=ON
-
  %ifos darwin
     # Additional installation rules for Mac OS X 
     addCMakeVariable  PARAVIEW_EXTRA_INSTALL_RULES_FILE:FILEPATH=%{_topdir}/BUILD/%{name}-%{version}/Applications/ParaView-3.8.1_extra_install_Darwin.cmake
@@ -206,7 +206,7 @@ cat << DOT_SH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.sh
 export PARAVIEW_DIR=\$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 export PARAVIEW_BIN_DIR=\$PARAVIEW_DIR/bin
 export PARAVIEW_LIB_DIR=\$PARAVIEW_DIR/lib
-export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-4.2
+export PARAVIEW_INCLUDE_DIR=\$PARAVIEW_DIR/include/paraview-4.3
 
 export PARAVIEW_VERSION=%{version}
 
@@ -217,7 +217,7 @@ export PARAVIEW_VERSION=%{version}
 #     startup of paraview or even make paraview crash on startup.
 export PV_PLUGIN_PATH=\$FOAM_LIBBIN/paraview_plugins
 
-[ -d \$PARAVIEW_LIB_DIR/paraview-4.2 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.2
+[ -d \$PARAVIEW_LIB_DIR/paraview-4.3 ] && _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.3
 
 # Enable access to the package applications if present
 [ -d \$PARAVIEW_BIN_DIR ] && _foamAddPath \$PARAVIEW_BIN_DIR
@@ -236,7 +236,7 @@ cat << DOT_CSH_EOF > $RPM_BUILD_ROOT/%{_installPrefix}/etc/%{name}-%{version}.cs
 setenv PARAVIEW_DIR \$WM_THIRD_PARTY_DIR/packages/%{name}-%{version}/platforms/\$WM_OPTIONS
 setenv PARAVIEW_BIN_DIR \$PARAVIEW_DIR/bin
 setenv PARAVIEW_LIB_DIR \$PARAVIEW_DIR/lib
-setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-4.2
+setenv PARAVIEW_INCLUDE_DIR \$PARAVIEW_DIR/include/paraview-4.3
 
 setenv PARAVIEW_VERSION %{version}
 
@@ -251,8 +251,8 @@ if ( -e \$PARAVIEW_BIN_DIR ) then
     _foamAddPath \$PARAVIEW_BIN_DIR
 endif
 
-if ( -e \$PARAVIEW_LIB_DIR/paraview-4.2 ) then
-    _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.2
+if ( -e \$PARAVIEW_LIB_DIR/paraview-4.3 ) then
+    _foamAddLib \$PARAVIEW_LIB_DIR/paraview-4.3
 endif
 
 
diff --git a/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec b/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec
index 48bed74e4..a56fe7459 100644
--- a/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec
+++ b/ThirdParty/rpmBuild/SPECS/gcc-4.9.2.spec
@@ -28,7 +28,7 @@
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
-#     Hrvoje Jasak, Wikki Ltd. (2015)
+#     Martin Beaudoin, Hydro-Quebec, (2015)
 #
 #------------------------------------------------------------------------------
 
@@ -94,21 +94,58 @@ Group: 			Development/Tools
     [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
     [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
 
-    GMP_VERSION=gmp-5.1.2
+    GMP_VERSION=gmp-6.0.0
     MPFR_VERSION=mpfr-3.1.2
-    MPC_VERSION=mpc-1.0.1
+    MPC_VERSION=mpc-1.0.3
+    ISL_VERSION=isl-0.12.2
+    CLOOG_VERSION=cloog-0.18.1
+
+    # Download dependency packages and add them as builtin components for gcc
+    #GMP
+    wget ftp://ftp.gnu.org/gnu/gmp/${GMP_VERSION}a.tar.xz
+    tar -xf ${GMP_VERSION}a.tar.xz
+    mv ${GMP_VERSION} gmp
+
+    #MPFR
+    wget ftp://ftp.gnu.org/gnu/mpfr/$MPFR_VERSION.tar.gz
+    tar -xf $MPFR_VERSION.tar.gz
+    mv ${MPFR_VERSION} mpfr
+
+    #MPC
+    wget ftp://ftp.gnu.org/gnu/mpc/$MPC_VERSION.tar.gz
+    tar -xf $MPC_VERSION.tar.gz
+    mv ${MPC_VERSION} mpc
+    
+    #ISL
+    wget ftp://gcc.gnu.org/pub/gcc/infrastructure/$ISL_VERSION.tar.bz2
+    tar -xf $ISL_VERSION.tar.bz2
+    mv ${ISL_VERSION} isl
+
+    #CLOOG
+    wget ftp://gcc.gnu.org/pub/gcc/infrastructure/$CLOOG_VERSION.tar.gz
+    tar -xf $CLOOG_VERSION.tar.gz
+    mv ${CLOOG_VERSION} cloog
 
     mkdir ./objBuildDir
     cd ./objBuildDir
 
+%ifos darwin
+    # Use 'bootstrap-debug' build configuration to force stripping of object
+    # files prior to comparison during bootstrap (broken by Xcode 6.3).
+    # Fix taken from HomeBrew and MacPorts projects
     ../configure     \
-        --prefix=%{_installPrefix}  \
-        --enable-languages=c,c++  \
-        --enable-shared           \
-        --disable-multilib        \
-	--with-mpc=$WM_THIRD_PARTY_DIR/packages/$MPC_VERSION/platforms/$WM_OPTIONS \
-	--with-gmp=$WM_THIRD_PARTY_DIR/packages/$GMP_VERSION/platforms/$WM_OPTIONS \
-	--with-mpfr=$WM_THIRD_PARTY_DIR/packages/$MPFR_VERSION/platforms/$WM_OPTIONS
+        --prefix=%{_installPrefix} \
+        --enable-languages=c,c++   \
+        --enable-shared            \
+        --with-build-config=bootstrap-debug \
+	--disable-multilib
+%else
+    ../configure     \
+        --prefix=%{_installPrefix} \
+        --enable-languages=c,c++   \
+        --enable-shared            \
+	--disable-multilib
+%endif
 
     [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
     make -j $WM_NCOMPPROCS
diff --git a/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec b/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec
index d6be05d6e..5309fc3c2 100644
--- a/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec
+++ b/ThirdParty/rpmBuild/SPECS/openmpi-1.6.5.spec
@@ -66,13 +66,13 @@
 
 %define buildroot       %{_topdir}/BUILD/%{name}-%{version}-root
 
-BuildRoot:	    %{buildroot}
+BuildRoot:	        %{buildroot}
 Summary: 		openmpi
 License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
-URL:            http://www.open-mpi.org/software/ompi/v1.6/downloads
+URL:                    http://www.open-mpi.org/software/ompi/v1.6/downloads
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
@@ -80,6 +80,15 @@ Group: 			Development/Tools
 
 %define _installPrefix  %{_prefix}/packages/%{name}-%{version}/platforms/%{_WM_OPTIONS}
 
+#--------------------------------------------------------------------------
+#
+# Here, we define default compiling options for openmpi
+#
+# One can override the option on the commande line : --define='MACRO EXPR'
+#
+%{!?_configureAdditionalArgs: %define _configureAdditionalArgs Undefined}
+
+
 %description
 %{summary}
 
@@ -95,6 +104,13 @@ Group: 			Development/Tools
     [ -n "$WM_CXXFLAGS" ]   &&  export CXXFLAGS="$WM_CXXFLAGS"
     [ -n "$WM_LDFLAGS" ]    &&  export LDFLAGS="$WM_LDFLAGS"
 
+    set +x
+    echo ""
+    echo "Compilation options:"
+    echo "     _configureAdditionalArgs : %{_configureAdditionalArgs}"
+    echo ""
+    set -x
+
     unset mpiWith
     # Enable GridEngine if it appears to be in use
     # If you don't want any integration with SGE, simply unset the SGE
@@ -127,7 +143,8 @@ Group: 			Development/Tools
         --disable-mpi-cxx \
         --without-slurm \
         --enable-mpi-profile $mpiWith \
-        --disable-vt
+        --disable-vt \
+	`echo %{?_configureAdditionalArgs}`
 
     [ -z "$WM_NCOMPPROCS" ] && WM_NCOMPPROCS=1
     make -j $WM_NCOMPPROCS
diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec
index 95309a2b3..6cd0ec191 100644
--- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec
+++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.5.spec
@@ -75,7 +75,7 @@ License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
-URL:                    http://download.qt-project.org/official_releases/qt/4.8/4.8.5
+URL:                    http://download.qt.io/archive/qt/4.8/4.8.5/qt-everywhere-opensource-src-4.8.5.tar.gz
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
diff --git a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec
index 09b4283ce..50a39a609 100644
--- a/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec
+++ b/ThirdParty/rpmBuild/SPECS/qt-everywhere-opensource-src-4.8.6.spec
@@ -28,7 +28,7 @@
 #     RPM spec file for creating a relocatable RPM
 #
 # Author:
-#     Martin Beaudoin, Hydro-Quebec, (2014)
+#     Martin Beaudoin, Hydro-Quebec, (2015)
 #
 #------------------------------------------------------------------------------
 
@@ -75,7 +75,7 @@ License: 		Unkown
 Name: 			%{name}
 Version: 		%{version}
 Release: 		%{release}
-URL:                    http://download.qt-project.org/official_releases/qt/4.8/4.8.6
+URL:                    http://download.qt.io/archive/qt/4.8/4.8.6/qt-everywhere-opensource-src-4.8.6.tar.gz
 Source: 		%url/%{name}-%{version}.tar.gz
 Prefix: 		%{_prefix}
 Group: 			Development/Tools
diff --git a/etc/bashrc b/etc/bashrc
index 4a73e2504..6df99b384 100755
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -80,6 +80,33 @@ export WM_PROJECT_USER_DIR=$HOME/$WM_PROJECT/$USER-$WM_PROJECT_VERSION
 #: ${WM_THIRD_PARTY_DIR=$WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION}; export WM_THIRD_PARTY_DIR
 export WM_THIRD_PARTY_DIR=$WM_PROJECT_DIR/ThirdParty
 
+# Enabling the usage of third-party software
+# This can be overriden in prefs.sh
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# For AllMake.stage1
+export WM_THIRD_PARTY_USE_CMAKE_2812=1
+
+#
+# For AllMake.stage2
+export WM_THIRD_PARTY_USE_OPENMPI_184=1
+
+#
+# For AllMake.stage3
+export WM_THIRD_PARTY_USE_METIS_510=1
+export WM_THIRD_PARTY_USE_PARMGRIDGEN_10=1
+export WM_THIRD_PARTY_USE_LIBCCMIO_261=1
+export WM_THIRD_PARTY_USE_MESQUITE_212=1
+export WM_THIRD_PARTY_USE_SCOTCH_600=1
+export WM_THIRD_PARTY_USE_PARMETIS_403=1
+export WM_THIRD_PARTY_USE_PYFOAM_064=1
+export WM_THIRD_PARTY_USE_HWLOC_172=1
+
+#
+# For AllMake.stage4
+export WM_THIRD_PARTY_USE_QT_486=1
+export WM_THIRD_PARTY_USE_PARAVIEW_401=1
+
+
 # Source files, possibly with some verbosity
 _foamSource()
 {
diff --git a/etc/cshrc b/etc/cshrc
index 73116ff49..5adf58124 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -73,6 +73,33 @@ setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 #setenv WM_THIRD_PARTY_DIR $WM_PROJECT_INST_DIR/ThirdParty-$WM_PROJECT_VERSION
 setenv WM_THIRD_PARTY_DIR $WM_PROJECT_DIR/ThirdParty
 
+# Enabling the usage of third-party software
+# This can be overriden in prefs.sh
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# For AllMake.stage1
+setenv WM_THIRD_PARTY_USE_CMAKE_2812 1
+
+#
+# For AllMake.stage2
+setenv WM_THIRD_PARTY_USE_OPENMPI_165 1
+
+#
+# For AllMake.stage3
+setenv WM_THIRD_PARTY_USE_METIS_510 1
+setenv WM_THIRD_PARTY_USE_PARMGRIDGEN_10 1
+setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1
+setenv WM_THIRD_PARTY_USE_MESQUITE_212 1
+setenv WM_THIRD_PARTY_USE_SCOTCH_600 1
+setenv WM_THIRD_PARTY_USE_PARMETIS_403 1
+setenv WM_THIRD_PARTY_USE_PYFOAM_064 1
+setenv WM_THIRD_PARTY_USE_HWLOC_172 1
+
+#
+# For AllMake.stage4
+setenv WM_THIRD_PARTY_USE_QT_486 1
+setenv WM_THIRD_PARTY_USE_PARAVIEW_401 1
+
+
 # Source files, possibly with some verbosity
 alias _foamSource 'if ($?FOAM_VERBOSE && $?prompt) echo "Sourcing: \!*"; source \!*'
 
diff --git a/etc/prefs.csh-EXAMPLE b/etc/prefs.csh-EXAMPLE
index eab032de1..af6b3ae32 100644
--- a/etc/prefs.csh-EXAMPLE
+++ b/etc/prefs.csh-EXAMPLE
@@ -170,4 +170,50 @@
 # You can override your identifier using this environment variable
 #setenv CDASH_SUBMIT_LOCAL_HOST_ID choose_your_CDash_system_identifer
 
+
+# ThirdParty packages: build control variables
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# By enabling any of these variables, you will active the compilation and
+# installation of the corresponding ThirdParty package
+#
+# For AllMake.stage1
+#setenv WM_THIRD_PARTY_USE_GCC_49  1
+#setenv WM_THIRD_PARTY_USE_GCC_48  1
+#setenv WM_THIRD_PARTY_USE_GCC_463 1
+#setenv WM_THIRD_PARTY_USE_GCC_451 1
+#setenv WM_THIRD_PARTY_USE_GCC_445 1
+#setenv WM_THIRD_PARTY_USE_PYTHON_27 1
+#setenv WM_THIRD_PARTY_USE_M4_146 1
+#setenv WM_THIRD_PARTY_USE_BISON_27 1
+#setenv WM_THIRD_PARTY_USE_FLEX_2535 1
+setenv WM_THIRD_PARTY_USE_CMAKE_2812 1
+
+#
+# For AllMake.stage2
+setenv WM_THIRD_PARTY_USE_OPENMPI_184 1
+#setenv WM_THIRD_PARTY_USE_OPENMPI_184_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64'
+#setenv WM_THIRD_PARTY_USE_OPENMPI_165 1
+#setenv WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs '--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64'
+#setenv WM_THIRD_PARTY_USE_OPENMPI_15 1
+#setenv WM_THIRD_PARTY_USE_OPENMPI_143 1
+#setenv WM_THIRD_PARTY_USE_OPENMPI_141 1
+
+#
+# For AllMake.stage3
+setenv WM_THIRD_PARTY_USE_METIS_510 1
+setenv WM_THIRD_PARTY_USE_PARMGRIDGEN_10 1
+setenv WM_THIRD_PARTY_USE_LIBCCMIO_261 1
+setenv WM_THIRD_PARTY_USE_MESQUITE_212 1
+setenv WM_THIRD_PARTY_USE_SCOTCH_600 1
+setenv WM_THIRD_PARTY_USE_PARMETIS_403 1
+setenv WM_THIRD_PARTY_USE_ZOLTAN_36 1
+setenv WM_THIRD_PARTY_USE_PYFOAM_064 1
+setenv WM_THIRD_PARTY_USE_HWLOC_172 1
+
+#
+# For AllMake.stage4
+setenv WM_THIRD_PARTY_USE_QT_486 1
+setenv WM_THIRD_PARTY_USE_PARAVIEW_401 1
+#setenv WM_THIRD_PARTY_USE_PARAVIEW_410 1
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/etc/prefs.sh-EXAMPLE b/etc/prefs.sh-EXAMPLE
index 99d56a201..7e61364d2 100644
--- a/etc/prefs.sh-EXAMPLE
+++ b/etc/prefs.sh-EXAMPLE
@@ -180,4 +180,56 @@ export FOAM_VERBOSE=1
 # You can override your identifier using this environment variable
 #export CDASH_SUBMIT_LOCAL_HOST_ID=choose_your_CDash_system_identifer
 
+
+# ThirdParty packages: build control variables
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# By enabling any of these variables, you will active the compilation and
+# installation of the corresponding ThirdParty package
+#
+# For AllMake.stage1
+#export WM_THIRD_PARTY_USE_GCC_49=1
+#export WM_THIRD_PARTY_USE_GCC_48=1
+#export WM_THIRD_PARTY_USE_GCC_463=1
+#export WM_THIRD_PARTY_USE_GCC_451=1
+#export WM_THIRD_PARTY_USE_GCC_445=1
+#export WM_THIRD_PARTY_USE_PYTHON_27=1
+#export WM_THIRD_PARTY_USE_M4_146=1
+#export WM_THIRD_PARTY_USE_BISON_27=1
+#export WM_THIRD_PARTY_USE_FLEX_2535=1
+export WM_THIRD_PARTY_USE_CMAKE_2812=1
+
+#
+# For AllMake.stage2
+export WM_THIRD_PARTY_USE_OPENMPI_184=1
+export WM_THIRD_PARTY_USE_OPENMPI_184_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64'
+#export WM_THIRD_PARTY_USE_OPENMPI_165=1
+#export WM_THIRD_PARTY_USE_OPENMPI_165_ConfigureAdditionalArgs='--enable-mpi-cxx --with-openib=/usr --with-openib-libdir=/usr/lib64'
+#export WM_THIRD_PARTY_USE_OPENMPI_15=1
+#export WM_THIRD_PARTY_USE_OPENMPI_143=1
+#export WM_THIRD_PARTY_USE_OPENMPI_141=1
+
+#
+# For AllMake.stage3
+export WM_THIRD_PARTY_USE_METIS_510=1
+export WM_THIRD_PARTY_USE_PARMGRIDGEN_10=1
+export WM_THIRD_PARTY_USE_LIBCCMIO_261=1
+export WM_THIRD_PARTY_USE_MESQUITE_212=1
+export WM_THIRD_PARTY_USE_SCOTCH_600=1
+export WM_THIRD_PARTY_USE_PARMETIS_403=1
+export WM_THIRD_PARTY_USE_ZOLTAN_36=1
+export WM_THIRD_PARTY_USE_PYFOAM_064=1
+export WM_THIRD_PARTY_USE_HWLOC_172=1
+
+#
+# For AllMake.stage4
+export WM_THIRD_PARTY_USE_QT_486=1
+export WM_THIRD_PARTY_USE_PARAVIEW_401=1
+#export WM_THIRD_PARTY_USE_PARAVIEW_410=1
+
+
+# Add in preset user preferences: will override site preferences
+if [ -e $WM_PROJECT_USER_DIR/etc/prefs.sh ]
+then
+    _foamSource $WM_PROJECT_USER_DIR/etc/prefs.sh
+fi
 # ----------------------------------------------------------------- end-of-file
diff --git a/etc/settings.csh b/etc/settings.csh
index f11adf99e..7047dceb3 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -99,9 +99,6 @@ case FOAM:
     breaksw
     case Gcc49:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS
-        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.csh
-        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.csh
-        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.csh
         _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS/etc/gcc-4.9.2.csh
     breaksw
     case Gcc47:
@@ -164,7 +161,15 @@ set mpi_version=unknown
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    if (-d $WM_THIRD_PARTY_DIR/packages/openmpi-1.6.5/platforms/$WM_OPTIONS ) then
+    if ($?WM_THIRD_PARTY_USE_OPENMPI_184 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.4/platforms/$WM_OPTIONS ) then
+        set mpi_version=openmpi-1.8.4
+
+        if ($?FOAM_VERBOSE && $?prompt) then
+            echo "Using openmpi-1.8.4 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
+        endif
+        _foamSource  $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh
+
+    else if ($?WM_THIRD_PARTY_USE_OPENMPI_165 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.6.5/platforms/$WM_OPTIONS ) then
         set mpi_version=openmpi-1.6.5
 
         if ($?FOAM_VERBOSE && $?prompt) then
@@ -172,7 +177,7 @@ case OPENMPI:
         endif
         _foamSource  $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh
 
-    else if (-d $WM_THIRD_PARTY_DIR/packages/openmpi-1.4.3/platforms/$WM_OPTIONS ) then
+    else if ($?WM_THIRD_PARTY_USE_OPENMPI_143 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.4.3/platforms/$WM_OPTIONS ) then
         set mpi_version=openmpi-1.4.3
 
         if ($?FOAM_VERBOSE && $?prompt) then
@@ -180,7 +185,7 @@ case OPENMPI:
         endif
         _foamSource  $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.csh
 
-    else if (-d $WM_THIRD_PARTY_DIR/packages/openmpi-1.5/platforms/$WM_OPTIONS ) then
+    else if ($?WM_THIRD_PARTY_USE_OPENMPI_143 != 0 && -d $WM_THIRD_PARTY_DIR/packages/openmpi-1.5/platforms/$WM_OPTIONS ) then
         set mpi_version=openmpi-1.5
 
         if ($?FOAM_VERBOSE && $?prompt) then
@@ -445,38 +450,38 @@ endif
 
 # Mesquite library if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( $?MESQUITE_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS ) then
+if ( $?MESQUITE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_MESQUITE_212 != 0 && -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS/etc/mesquite-2.1.2.csh
 endif
 
 # Metis library if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( $?METIS_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS ) then
+if ( $?METIS_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_METIS_510 != 0 && -e $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS/etc/metis-5.1.0.csh
 endif
 
 # ParMetis library if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( $?PARMETIS_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS ) then
+if ( $?PARMETIS_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARMETIS_403 != 0 && -e $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS/etc/parmetis-4.0.3.csh
 endif
 
 # ParMGridGen library if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( $?PARMGRIDGEN_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS ) then
+if ( $?PARMGRIDGEN_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARMGRIDGEN_10 != 0 && -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS/etc/ParMGridGen-1.0.csh
 endif
 
 # Load Libccmio library
 # ~~~~~~~~~~~~~~~~~~~~~
-if ( $?LIBCCMIO_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS ) then
+if ( $?LIBCCMIO_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_LIBCCMIO_261 != 0 && -e $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS/etc/libccmio-2.6.1.csh
 endif
 
 
 # Scotch library if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( $?SCOTCH_SYSTEM == 0 && -e $WM_THIRD_PARTY_DIR/packages/scotch-6.0.0/platforms/$WM_OPTIONS ) then
+if ( $?SCOTCH_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_SCOTCH_600 != 0 && -e $WM_THIRD_PARTY_DIR/packages/scotch-6.0.0/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/scotch-6.0.0/platforms/$WM_OPTIONS/etc/scotch-6.0.0.csh
 endif
 
@@ -490,75 +495,97 @@ endif
 
 # cmake
 # ~~~~~
-if ( $?CMAKE_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/cmake-2.8.12/platforms/$WM_OPTIONS ) then
+if ( $?CMAKE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_CMAKE_2812 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/cmake-2.8.12/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.12/platforms/$WM_OPTIONS/etc/cmake-2.8.12.csh
 endif
 
+if ( $?CMAKE_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_CMAKE_311 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/cmake-3.1.1/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-3.1.1/platforms/$WM_OPTIONS/etc/cmake-3.1.1.csh
+endif
+
 # m4
 # ~~~~~
-if ( $?M4_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/m4-1.4.16/platforms/$WM_OPTIONS ) then
+if ( $?M4_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_M4_1416 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/m4-1.4.16/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/m4-1.4.16/platforms/$WM_OPTIONS/etc/m4-1.4.16.csh
 endif
 
 # bison
 # ~~~~~
-if ( $?BISON_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/bison-2.7/platforms/$WM_OPTIONS ) then
+if ( $?BISON_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_BISON_27 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/bison-2.7/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS/etc/bison-2.7.csh
 endif
 
 # flex
 # ~~~~~
-if ( $?FLEX_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/flex-2.5.35/platforms/$WM_OPTIONS ) then
+if ( $?FLEX_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_FLEX_2535 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/flex-2.5.35/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/flex-2.5.35/platforms/$WM_OPTIONS/etc/flex-2.5.35.csh
 endif
 
 # zoltan
 # ~~~~~
-if ( $?ZOLTAN_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/zoltan-3.5/platforms/$WM_OPTIONS ) then
+if ( $?ZOLTAN_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_ZOLTAN_35 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/zoltan-3.5/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/zoltan-3.5/platforms/$WM_OPTIONS/etc/zoltan-3.5.csh
 endif
 
 # Python
 # ~~~~~
-if ( $?PYTHON_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/Python-2.7/platforms/$WM_OPTIONS ) then
+if ( $?PYTHON_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYTHON_27 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/Python-2.7/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/Python-2.7/platforms/$WM_OPTIONS/etc/Python-2.7.csh
 endif
 
 # PyFoam
 # ~~~~~~
-if ( $?PYFOAM_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.4/platforms/noarch ) then
+if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_063 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.3/platforms/noarch ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.csh
+endif
+if ( $?PYFOAM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PYFOAM_063 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/PyFoam-0.6.4/platforms/noarch ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch/etc/PyFoam-0.6.4.csh
 endif
 
 # hwloc
 # ~~~~~
-if ( $?HWLOC_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.7.2/platforms/$WM_OPTIONS ) then
+if ( $?HWLOC_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_HWLOC_172 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/hwloc-1.7.2/platforms/$WM_OPTIONS ) then
     _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.2/platforms/$WM_OPTIONS/etc/hwloc-1.7.2.csh
 endif
 
 # QT
 # ~~~~~
-if ( $?QT_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS )then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.6.csh
+if ( $?QT_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_QT_486 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS )then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.5/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.5.csh
 endif
 
 # PARAVIEW
 # ~~~~~
-#if ( $?PARAVIEW_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.3.1/platforms/$WM_OPTIONS ) then
-#    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS/etc/ParaView-4.3.1.csh
-
-if ( $?PARAVIEW_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.0.1/platforms/$WM_OPTIONS ) then
-    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.0.1/platforms/$WM_OPTIONS/etc/ParaView-4.0.1.csh
-
-#if ( $?PARAVIEW_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ) then
-#   _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.csh
-
-#if ( $?PARAVIEW_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ) then
-#    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.csh
-
-#if ( $?PARAVIEW_SYSTEM == 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ) then
-#    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.csh
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_431 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.3.1/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS/etc/ParaView-4.3.1.csh
 endif
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_410 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.1.0/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.1.0/platforms/$WM_OPTIONS/etc/ParaView-4.1.0.csh
+endif
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_401 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-4.0.1/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.0.1/platforms/$WM_OPTIONS/etc/ParaView-4.0.1.csh
+endif
+
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_3141 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ) then
+   _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.csh
+endif
+
+if ( $?PARAVIEW_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_PARAVIEW_381 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.csh
+endif
+
+# llvm
+# ~~~~~
+if ( $?LLVM_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_LLVM_360 != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/llvm-3.6.0/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/llvm-3.6.0/platforms/$WM_OPTIONS/etc/llvm-3.6.0.csh
+endif
+
+# mesa
+# ~~~~~
+if ( $?MESA_SYSTEM == 0 && $?WM_THIRD_PARTY_USE_MESA_GIT != 0 && -e "$WM_THIRD_PARTY_DIR"/packages/mesa-git/platforms/$WM_OPTIONS ) then
+    _foamSource $WM_THIRD_PARTY_DIR/packages/mesa-git/platforms/$WM_OPTIONS/etc/mesa-git.csh
+endif
+
 
 if ( $WM_ARCH == "darwinIntel" || $WM_ARCH == "darwinIntel64" ) then
     setenv DYLD_LIBRARY_PATH ${LD_LIBRARY_PATH}
diff --git a/etc/settings.sh b/etc/settings.sh
index 152524462..03f8ed405 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -139,9 +139,6 @@ FOAM)
         ;;
     Gcc49)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS
-        _foamSource $WM_THIRD_PARTY_DIR/packages/gmp-5.1.2/platforms/$WM_OPTIONS/etc/gmp-5.1.2.sh
-        _foamSource $WM_THIRD_PARTY_DIR/packages/mpfr-3.1.2/platforms/$WM_OPTIONS/etc/mpfr-3.1.2.sh
-        _foamSource $WM_THIRD_PARTY_DIR/packages/mpc-1.0.1/platforms/$WM_OPTIONS/etc/mpc-1.0.1.sh
         _foamSource $WM_THIRD_PARTY_DIR/packages/gcc-4.9.2/platforms/$WM_OPTIONS/etc/gcc-4.9.2.csh
         ;;
     Gcc47)
@@ -212,7 +209,16 @@ unset MPI_ARCH_PATH
 mpi_version=unknown
 case "$WM_MPLIB" in
 OPENMPI)
-    if [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.6.5/platforms/$WM_OPTIONS ]
+    if [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_184 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.8.4/platforms/$WM_OPTIONS ]
+        then
+        mpi_version=openmpi-1.8.4
+        if [ "$FOAM_VERBOSE" -a "$PS1" ]
+        then
+            echo "Using openmpi-1.8.4 from the ThirdParty package: $WM_THIRD_PARTY_DIR/packages/$mpi_version"
+        fi
+        _foamSource  $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
+
+    elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_165 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.6.5/platforms/$WM_OPTIONS ]
         then
         mpi_version=openmpi-1.6.5
         if [ "$FOAM_VERBOSE" -a "$PS1" ]
@@ -221,7 +227,7 @@ OPENMPI)
         fi
         _foamSource  $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
 
-    elif [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.4.3/platforms/$WM_OPTIONS ]
+    elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_143 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.4.3/platforms/$WM_OPTIONS ]
         then
         mpi_version=openmpi-1.4.3
         if [ "$FOAM_VERBOSE" -a "$PS1" ]
@@ -230,7 +236,7 @@ OPENMPI)
         fi
         _foamSource  $WM_THIRD_PARTY_DIR/packages/$mpi_version/platforms/$WM_OPTIONS/etc/$mpi_version.sh
 
-    elif [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.5/platforms/$WM_OPTIONS ]
+    elif [ ! -z $WM_THIRD_PARTY_USE_OPENMPI_15 ] && [ -e $WM_THIRD_PARTY_DIR/packages/openmpi-1.5/platforms/$WM_OPTIONS ]
         then
         mpi_version=openmpi-1.5
         if [ "$FOAM_VERBOSE" -a "$PS1" ]
@@ -543,7 +549,7 @@ export MPI_BUFFER_SIZE
 
 # Load Mesquite library
 # ~~~~~~~~~~~~~~~~~~~~~~
-[ -z "$MESQUITE_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS ] && {
+[ -z "$MESQUITE_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_MESQUITE_212 ] && [ -e $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/mesquite-2.1.2/platforms/$WM_OPTIONS/etc/mesquite-2.1.2.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    MESQUITE_DIR is initialized to: $MESQUITE_DIR"
@@ -551,7 +557,7 @@ export MPI_BUFFER_SIZE
 
 # Load Metis library
 # ~~~~~~~~~~~~~~~~~~
-[ -z "$METIS_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS ] && {
+[ -z "$METIS_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_METIS_510 ] && [ -e $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/metis-5.1.0/platforms/$WM_OPTIONS/etc/metis-5.1.0.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    METIS_DIR is initialized to: $METIS_DIR"
@@ -559,7 +565,7 @@ export MPI_BUFFER_SIZE
 
 # Load ParMetis library
 # ~~~~~~~~~~~~~~~~~~~~~
-[ -z "$PARMETIS_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS ] && {
+[ -z "$PARMETIS_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARMETIS_403 ] && [ -e $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/parmetis-4.0.3/platforms/$WM_OPTIONS/etc/parmetis-4.0.3.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    PARMETIS_DIR is initialized to: $PARMETIS_DIR"
@@ -567,7 +573,7 @@ export MPI_BUFFER_SIZE
 
 # Load ParMGridGen library
 # ~~~~~~~~~~~~~~~~~~~~~~~~~
-[ -z "$PARMGRIDGEN_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS ] && {
+[ -z "$PARMGRIDGEN_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARMGRIDGEN_10 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParMGridGen-1.0/platforms/$WM_OPTIONS/etc/ParMGridGen-1.0.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    PARMGRIDGEN_DIR is initialized to: $PARMGRIDGEN_DIR"
@@ -575,7 +581,7 @@ export MPI_BUFFER_SIZE
 
 # Load Libccmio library
 # ~~~~~~~~~~~~~~~~~~~~~
-[ -z "$LIBCCMIO_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS ] && {
+[ -z "$LIBCCMIO_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_LIBCCMIO_261 ] && [ -e $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/libccmio-2.6.1/platforms/$WM_OPTIONS/etc/libccmio-2.6.1.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    LIBCCMIO_DIR is initialized to: $LIBCCMIO_DIR"
@@ -583,7 +589,7 @@ export MPI_BUFFER_SIZE
 
 # Load Scotch library
 # ~~~~~~~~~~~~~~~~~~~
-[ -z "$SCOTCH_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/scotch-6.0.0/platforms/$WM_OPTIONS ] && {
+[ -z "$SCOTCH_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_SCOTCH_600 ] && [ -e $WM_THIRD_PARTY_DIR/packages/scotch-6.0.0/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/scotch-6.0.0/platforms/$WM_OPTIONS/etc/scotch-6.0.0.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    SCOTCH_DIR is initialized to: $SCOTCH_DIR"
@@ -591,28 +597,34 @@ export MPI_BUFFER_SIZE
 
 # Load cmake
 # ~~~~~~~~~~
-[ -z "$CMAKE_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.12/platforms/$WM_OPTIONS ] && {
+[ -z "$CMAKE_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_CMAKE_2812 ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-2.8.12/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-2.8.12/platforms/$WM_OPTIONS/etc/cmake-2.8.12.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    CMAKE_DIR is initialized to: $CMAKE_DIR"
 
+
+[ -z "$CMAKE_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_CMAKE_311 ] && [ -e $WM_THIRD_PARTY_DIR/packages/cmake-3.1.1/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/cmake-3.1.1/platforms/$WM_OPTIONS/etc/cmake-3.1.1.sh
+}
+[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    CMAKE_DIR is initialized to: $CMAKE_DIR"
+
 # Load m4
 # ~~~~~~~~~~
-[ -z "$M4_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/m4-1.4.16/platforms/$WM_OPTIONS ] && {
+[ -z "$M4_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_M4_1416 ] && [ -e $WM_THIRD_PARTY_DIR/packages/m4-1.4.16/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/m4-1.4.16/platforms/$WM_OPTIONS/etc/m4-1.4.16.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    M4_DIR is initialized to: $M4_DIR"
 
 # Load bison
 # ~~~~~~~~~~
-[ -z "$BISON_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS ] && {
+[ -z "$BISON_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_BISON_27 ] && [ -e $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/bison-2.7/platforms/$WM_OPTIONS/etc/bison-2.7.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    BISON_DIR is initialized to: $BISON_DIR"
 
 # Load flex
 # ~~~~~~~~~~
-[ -z "$FLEX_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/flex-2.5.35/platforms/$WM_OPTIONS ] && {
+[ -z "$FLEX_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_FLEX_2535 ] && [ -e $WM_THIRD_PARTY_DIR/packages/flex-2.5.35/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/flex-2.5.35/platforms/$WM_OPTIONS/etc/flex-2.5.35.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    FLEX_DIR is initialized to: $FLEX_DIR"
@@ -620,7 +632,7 @@ export MPI_BUFFER_SIZE
 
 # Load zoltan
 # ~~~~~~~~~~
-[ -z "$ZOLTAN_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/zoltan_3.5 ] && {
+[ -z "$ZOLTAN_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_ZOLTAN_35 ] && [ -e $WM_THIRD_PARTY_DIR/packages/zoltan_3.5 ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/zoltan_3.5/platforms/$WM_OPTIONS/etc/zoltan_3.5.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    ZOLTAN_DIR is initialized to: $ZOLTAN_DIR"
@@ -628,14 +640,17 @@ export MPI_BUFFER_SIZE
 
 # Load Python
 # ~~~~~~~~~~~
-[ -z "$PYTHON_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/Python-2.7/platforms/$WM_OPTIONS ] && {
+[ -z "$PYTHON_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PYTHON_27 ] && [ -e $WM_THIRD_PARTY_DIR/packages/Python-2.7/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/Python-2.7/platforms/$WM_OPTIONS/etc/Python-2.7.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    PYTHON_DIR is initialized to: $PYTHON_DIR"
 
 # Load PyFoam
 # ~~~~~~~~~~~
-[ -z "$PYFOAM_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch ] && {
+[ -z "$PYFOAM_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PYFOAM_063 ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.3/platforms/noarch/etc/PyFoam-0.6.3.sh
+}
+[ -z "$PYFOAM_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PYFOAM_064 ] && [ -e $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/PyFoam-0.6.4/platforms/noarch/etc/PyFoam-0.6.4.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    PYFOAM_DIR is initialized to: $PYFOAM_DIR"
@@ -651,14 +666,14 @@ fi
 
 # Load hwloc
 # ~~~~~~~~~~~
-[ -z "$HWLOC_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.2/platforms/$WM_OPTIONS ] && {
+[ -z "$HWLOC_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_HWLOC_172 ] && [ -e $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.2/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/hwloc-1.7.2/platforms/$WM_OPTIONS/etc/hwloc-1.7.2.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    HWLOC_DIR is initialized to: $HWLOC_DIR"
 
 # Load QT
 # ~~~~~~~
-[ ! -z "$QT_THIRD_PARTY" ] && [ -e $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS ] && {
+[ ! -z "$QT_THIRD_PARTY" ] && [ ! -z $WM_THIRD_PARTY_USE_QT_486 ] && [ -e $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/qt-everywhere-opensource-src-4.8.6/platforms/$WM_OPTIONS/etc/qt-everywhere-opensource-src-4.8.6.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    QT_DIR is initialized to: $QT_DIR"
@@ -666,18 +681,39 @@ fi
 
 # Load ParaView
 # ~~~~~~~~~~~~~
-#[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS ] && {
-#    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS/etc/ParaView-4.3.1.sh
-[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.0.1/platforms/$WM_OPTIONS ] && {
+[ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_431 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.3.1/platforms/$WM_OPTIONS/etc/ParaView-4.3.1.sh
+}
+[ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_410 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.1.0/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.1.0/platforms/$WM_OPTIONS/etc/ParaView-4.1.0.sh
+}
+[ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_401 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-4.0.1/platforms/$WM_OPTIONS ] && {
     _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-4.0.1/platforms/$WM_OPTIONS/etc/ParaView-4.0.1.sh
-#[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ] && {
-#    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.sh
-#[ -z "$PARAVIEW_SYSTEM" ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ] && {
-#    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
+}
+[ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_3141 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.14.1/platforms/$WM_OPTIONS/etc/ParaView-3.14.1.sh
+}
+[ -z "$PARAVIEW_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_PARAVIEW_381 ] && [ -e $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/ParaView-3.8.1/platforms/$WM_OPTIONS/etc/ParaView-3.8.1.sh
 }
 [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    PARAVIEW_DIR is initialized to: $PARAVIEW_DIR"
 
 
+# Load llvm 
+# ~~~~~~~~~~~~~~~~~~~~~~
+[ -z "$LLVM_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_LLVM_360 ] && [ -e $WM_THIRD_PARTY_DIR/packages/llvm-3.6.0/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/llvm-3.6.0/platforms/$WM_OPTIONS/etc/llvm-3.6.0.sh
+}
+[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    LLVM_DIR is initialized to: $LLVM_DIR"
+
+# Load mesa 
+# ~~~~~~~~~~~~~~~~~~~~~~
+[ -z "$MESA_SYSTEM" ] && [ ! -z $WM_THIRD_PARTY_USE_MESA_GIT ] && [ -e $WM_THIRD_PARTY_DIR/packages/mesa-git/platforms/$WM_OPTIONS ] && {
+    _foamSource $WM_THIRD_PARTY_DIR/packages/mesa-git/platforms/$WM_OPTIONS/etc/mesa-git.sh
+}
+[ "$FOAM_VERBOSE" -a "$PS1" ] && echo "    MESA_DIR is initialized to: $MESA_DIR"
+
+
 # cleanup environment:
 # ~~~~~~~~~~~~~~~~~~~~
 unset _foamAddPath _foamAddLib minBufferSize