CONFIG: adjust for updated ThirdParty

- also update settings to include newer compiler versions

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -6,13 +6,17 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for compilation (at least for error catching)
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
+# Get version info and arch-path
+. $WM_PROJECT_DIR/etc/config.sh/functions
+_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/libccmio)
+
 set -x
 
-# build libccmio and create lnInclude directory
-$WM_THIRD_PARTY_DIR/AllwmakeLibccmio
+# Build libccmio (.so)
+$WM_THIRD_PARTY_DIR/makeCCMIO
 
-# if the library built properly, the headers should exist too
-if [ -e $FOAM_EXT_LIBBIN/libccmio.so ]
+if [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
+  -a -e $FOAM_EXT_LIBBIN/libccmio.so ]
 then
     wmake ccm26ToFoam
 fi

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Make/options

-LIBCCMIO_DIR = $(WM_THIRD_PARTY_DIR)/libccmio-2.6.1
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIBCCMIO_DIR) \
-    -I$(LIBCCMIO_DIR)/lnInclude
+    -I$(CCMIO_ARCH_PATH)/include
 
 EXE_LIBS = \
     -lfiniteVolume \

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/ccm26ToFoam.C

@@ -43,7 +43,7 @@ Description
 #include "SortableList.H"
 #include "cellSet.H"
 
-#include <ccmio.h>
+#include "libccmio/ccmio.h"
 #include <vector>
 
 using namespace Foam;

etc/bashrc

@@ -62,7 +62,7 @@ foamInstall=$HOME/$WM_PROJECT
 export WM_COMPILER_TYPE=system
 
 #- Compiler:
-#    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49| Clang | Icc
+#    WM_COMPILER = Gcc | Gcc4[5-9] | Gcc5[1-4] | Gcc61 | Clang | Icc
 export WM_COMPILER=Gcc
 unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 

etc/config.csh/CGAL

@@ -30,7 +30,7 @@
 ##------------------------------------------------------------------------------
 
 set boost_version=boost-system
-set cgal_version=CGAL-4.7
+set cgal_version=CGAL-4.8
 
 setenv BOOST_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$boost_version
 setenv CGAL_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$cgal_version

etc/config.csh/paraview

@@ -54,7 +54,7 @@ end
 #setenv ParaView_VERSION 4.1.0
 #setenv ParaView_VERSION 4.3.1
 #setenv ParaView_VERSION 4.4.0
-setenv ParaView_VERSION 5.0.0
+setenv ParaView_VERSION 5.0.1
 setenv ParaView_MAJOR detect
 
 

etc/config.csh/settings

@@ -217,9 +217,9 @@ switch ("$WM_COMPILER_TYPE")
 case OpenFOAM:
 case ThirdParty:
     # Default versions of GMP, MPFR and MPC, overide as necessary
-    set gmp_version=gmp-5.1.2
-    set mpfr_version=mpfr-3.1.2
-    set mpc_version=mpc-1.0.1
+    set gmp_version=gmp-6.0.1
+    set mpfr_version=mpfr-3.1.4
+    set mpc_version=mpc-1.0.3
     switch ("$WM_COMPILER")
     case Gcc:
     case Gcc48:
@@ -246,11 +246,18 @@ case ThirdParty:
     case Gcc53:
         set gcc_version=gcc-5.3.0
         breaksw
+    case Gcc54:
+        set gcc_version=gcc-5.4.0
+        breaksw
+    case Gcc61:
+        set gcc_version=gcc-6.1.0
+        breaksw
     case Clang:
         # Using clang - not gcc
         setenv WM_CC 'clang'
         setenv WM_CXX 'clang++'
         set clang_version=llvm-3.7.0
+        # set clang_version=llvm-3.8.0
         breaksw
     default:
         echo

etc/config.sh/CGAL

@@ -36,7 +36,7 @@
 #------------------------------------------------------------------------------
 
 boost_version=boost-system
-cgal_version=CGAL-4.7
+cgal_version=CGAL-4.8
 
 if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
 then

etc/config.sh/compiler

@@ -34,9 +34,9 @@ case "$WM_COMPILER_TYPE" in
 OpenFOAM | ThirdParty)
 
     # Default versions of GMP, MPFR and MPC, override as necessary
-    gmp_version=gmp-5.1.2
-    mpfr_version=mpfr-3.1.2
-    mpc_version=mpc-1.0.1
+    gmp_version=gmp-6.0.1
+    mpfr_version=mpfr-3.1.4
+    mpc_version=mpc-1.0.3
 
     case "$WM_COMPILER" in
     Gcc | Gcc48)
@@ -63,11 +63,18 @@ OpenFOAM | ThirdParty)
     Gcc53)
         gcc_version=gcc-5.3.0
         ;;
+    Gcc54)
+        gcc_version=gcc-5.4.0
+        ;;
+    Gcc61)
+        gcc_version=gcc-6.1.0
+        ;;
     Clang)
         # Using clang - not gcc
         export WM_CC='clang'
         export WM_CXX='clang++'
         clang_version=llvm-3.7.0
+        # clang_version=llvm-3.8.0
         ;;
     *)
         echo 1>&2

etc/config.sh/libccmio

+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/libccmio
+#
+# Description
+#     Setup file for libccmio include/libraries.
+#     Sourced during wmake process only.
+#
+#     Dynamic libraries are found under the FOAM_EXT_LIBBIN path.
+#     Static libraries  are found under the CCMIO_ARCH_PATH/lib path.
+#
+# Note
+#     A csh version is not needed, since the values here are only sourced
+#     during the wmake process
+#------------------------------------------------------------------------------
+
+ccmio_version=libccmio-2.6.1
+export CCMIO_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$ccmio_version
+
+#------------------------------------------------------------------------------

etc/config.sh/paraview

@@ -62,7 +62,7 @@ done
 #export ParaView_VERSION=4.1.0
 #export ParaView_VERSION=4.3.1
 #export ParaView_VERSION=4.4.0
-export ParaView_VERSION=5.0.0
+export ParaView_VERSION=5.0.1
 export ParaView_MAJOR=detect
 
 

etc/cshrc

@@ -61,7 +61,7 @@ if ( ! $?FOAM_INST_DIR ) setenv FOAM_INST_DIR $foamInstall
 setenv WM_COMPILER_TYPE system
 
 #- Compiler:
-#    WM_COMPILER = Gcc | Gcc45 | Gcc46 | Gcc47 | Gcc48 | Gcc49 | Clang | Icc
+#    WM_COMPILER = Gcc | Gcc4[5-9] | Gcc5[1-4] | Gcc61 | Clang | Icc
 setenv WM_COMPILER Gcc
 setenv WM_COMPILER_ARCH # defined but empty
 unsetenv WM_COMPILER_LIB_ARCH