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

@@ -1,10 +1,7 @@
-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;