From 4c81ee202d9ec4334572f6bb4adeae207c17ae84 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@esi-group.com>
Date: Mon, 18 Dec 2017 10:51:53 +0100
Subject: [PATCH] CONFIG: update for gcc-4.9.4, and cfmesh module

---
 Allwmake                | 7 ++++---
 etc/bashrc              | 2 +-
 etc/config.csh/compiler | 5 ++++-
 etc/config.sh/compiler  | 5 ++++-
 etc/cshrc               | 2 +-
 modules/cfmesh          | 2 +-
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/Allwmake b/Allwmake
index 6c7cc3d95c..ed3d03e789 100755
--- a/Allwmake
+++ b/Allwmake
@@ -46,9 +46,10 @@ applications/Allwmake $targetType $*
 # Additional components/modules
 if [ -d "$WM_PROJECT_DIR/modules" ]
 then
-(
-    cd $WM_PROJECT_DIR/modules 2>/dev/null && wmake -all
-)
+    echo "========================================"
+    echo "Compile OpenFOAM modules"
+    echo
+    (cd $WM_PROJECT_DIR/modules 2>/dev/null && wmake -all)
 fi
 
 # Some summary information
diff --git a/etc/bashrc b/etc/bashrc
index 61620deba6..2ad6b3512d 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -60,7 +60,7 @@ unset rc
 export WM_COMPILER_TYPE=system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-3] | Gcc7[1-2] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-2] | GccKNL |
 #   Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
 export WM_COMPILER=Gcc
 
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index e0fd81d075..6b0a286b12 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -31,7 +31,7 @@ case ThirdParty:
         set gcc_version=gcc-4.8.5
         breaksw
     case Gcc49:
-        set gcc_version=gcc-4.9.3
+        set gcc_version=gcc-4.9.4
         breaksw
     case Gcc51:
         set gcc_version=gcc-5.1.0
@@ -57,6 +57,9 @@ case ThirdParty:
     case Gcc63:
         set gcc_version=gcc-6.3.0
         breaksw
+    case Gcc64:
+        set gcc_version=gcc-6.4.0
+        breaksw
     case Gcc71:
         set gcc_version=gcc-7.1.0
         breaksw
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 84de0e9aac..bd16912d13 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -30,7 +30,7 @@ ThirdParty)
         gcc_version=gcc-4.8.5
         ;;
     Gcc49)
-        gcc_version=gcc-4.9.3
+        gcc_version=gcc-4.9.4
         ;;
     Gcc51)
         gcc_version=gcc-5.1.0
@@ -56,6 +56,9 @@ ThirdParty)
     Gcc63)
         gcc_version=gcc-6.3.0
         ;;
+    Gcc64)
+        gcc_version=gcc-6.4.0
+        ;;
     Gcc71)
         gcc_version=gcc-7.1.0
         ;;
diff --git a/etc/cshrc b/etc/cshrc
index fc5a17a182..9a1e81d3ee 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -57,7 +57,7 @@ setenv FOAM_INST_DIR `lsof +p $$ |& \
 setenv WM_COMPILER_TYPE system
 
 # [WM_COMPILER] - Compiler:
-# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-3] | Gcc7[1-2] | GccKNL |
+# = Gcc | Gcc4[8-9] | Gcc5[1-5] | Gcc6[1-4] | Gcc7[1-2] | GccKNL |
 #   Clang | Clang3[8-9] | Clang[45]0 | Icc | IccKNL | Cray
 setenv WM_COMPILER Gcc
 
diff --git a/modules/cfmesh b/modules/cfmesh
index 3b91ceb0bb..7fb146a232 160000
--- a/modules/cfmesh
+++ b/modules/cfmesh
@@ -1 +1 @@
-Subproject commit 3b91ceb0bb65ceb23b2735fe52305336be7e0aac
+Subproject commit 7fb146a2324d59bcfa0a6f5fc6bdf14ca318ca55