STYLE: use _foamConfig function instead of _foamEtc -config

etc/tools/ThirdPartyFunctions

@@ -125,7 +125,7 @@ requireWMakeToolchain()
 # Some functions as per OpenFOAM etc/config.sh/functions
 
 unset -f _foamAddLib _foamAddLibAuto _foamAddMan _foamAddPath # Get settings only
-unset -f _foamClean _foamEtc
+unset -f _foamClean _foamConfig
 
 if [ -x "$WM_PROJECT_DIR/bin/foamCleanPath" ]
 then
@@ -140,8 +140,8 @@ else
     _foamClean() { echo "No foamCleanPath" 1>&2; }
 fi
 
-# Source an etc file
-_foamEtc() { eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh $@)"; }
+# Source an etc/config.sh file
+_foamConfig() { eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh -config $@)"; }
 
 #------------------------------------------------------------------------------
 

makeADIOS

@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # ADIOS version from OpenFOAM etc/config.sh file:
-_foamEtc -config ADIOS
+_foamConfig ADIOS
 
 adiosPACKAGE=${adios_version:-adios-none}
 

makeADIOS2

@@ -27,7 +27,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
 # ADIOS2 version from OpenFOAM etc/config.sh file:
-_foamEtc -config ADIOS2
+_foamConfig ADIOS2
 
 adios2PACKAGE=${adios2_version:-adios-none}
 

makeCCMIO

@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # libccmio version from OpenFOAM etc/config.sh file:
-_foamEtc -config ccmio
+_foamConfig ccmio
 
 ccmioPACKAGE=${ccmio_version:-libccmio-2.6.1}
 targetType=lib  # Default is static linkage

makeCGAL

@@ -67,8 +67,8 @@ unset BOOST_ARCH_PATH CGAL_ARCH_PATH GMP_ARCH_PATH MPFR_ARCH_PATH   # Purge old
 
 # CGAL, boost and gmp/mpfr versions from OpenFOAM etc/config.sh files.
 # Get compiler first and let CGAL config override GMP and MPFR
-_foamEtc -config compiler
-_foamEtc -config CGAL
+_foamConfig compiler
+_foamConfig CGAL
 
 boostPACKAGE=${boost_version:-boost-system}
 gmpPACKAGE=${gmp_version:-gmp-system}

makeFFTW

@@ -47,7 +47,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # FFTW version from OpenFOAM etc/config.sh file:
-_foamEtc -config FFTW
+_foamConfig FFTW
 
 fftwPACKAGE=${fftw_version:-fftw-system}
 

makeGcc

@@ -45,7 +45,7 @@ unset GMP_ARCH_PATH MPFR_ARCH_PATH                                  # Purge old
 WM_COMPILER_TYPE=ThirdParty                # Ensure we get the correct settings
 
 # Default GCC, mpfr, gmp and mpc versions from OpenFOAM etc/config.sh file:
-_foamEtc -config compiler
+_foamConfig compiler
 
 gmpPACKAGE=${gmp_version:-gmp-system}
 mpfrPACKAGE=${mpfr_version:-mpfr-system}

makeGperftools

@@ -29,7 +29,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 #------------------------------------------------------------------------------
 
 # Gperftools version from OpenFOAM etc/config.sh file:
-_foamEtc -config gperftools
+_foamConfig gperftools
 
 gperftoolsPACKAGE=${gperftools_version:-gperftools-system}
 

makeKAHIP

@@ -61,7 +61,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 }
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-_foamEtc -config kahip
+_foamConfig kahip
 
 kahipPACKAGE=${KAHIP_VERSION:-kahip-system}
 targetType=libso

makeLLVM

@@ -50,7 +50,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 WM_COMPILER_TYPE=ThirdParty                # Ensure we get the correct settings
 
 # LLVM/Clang version from OpenFOAM etc/config.sh file:
-_foamEtc -config compiler
+_foamConfig compiler
 
 llvmPACKAGE=$clang_version
 

makeMETIS

@@ -61,7 +61,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 }
 . etc/tools/ThirdPartyFunctions
 #------------------------------------------------------------------------------
-_foamEtc -config metis
+_foamConfig metis
 
 metisPACKAGE=${METIS_VERSION:-metis-system}
 targetType=libso

makeMGridGen

@@ -30,7 +30,7 @@ wmakeCheckPwd "$WM_THIRD_PARTY_DIR" || {
 #------------------------------------------------------------------------------
 
 # mgridgen version from OpenFOAM etc/config.sh file:
-_foamEtc -config mgridgen
+_foamConfig mgridgen
 
 mgridgenPACKAGE=${MGRIDGEN_VERSION:-mgridgen-none}
 

makeMPICH

@@ -58,7 +58,7 @@ _foamAddPath() { true; }
 WM_MPLIB=MPICH                                  # Ensure we get the correct MPI
 
 # mpich version from OpenFOAM etc/config.sh file:
-_foamEtc -config mpi
+_foamConfig mpi
 
 mpiPACKAGE=${FOAM_MPI:-mpich-system}
 

makeMesa

@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 unset vtk_version mesa_version                           # Purge current values
 
 # mesa version from OpenFOAM etc/config.sh file:
-_foamEtc -config vtk
+_foamConfig vtk
 
 mesaPACKAGE=$mesa_version
 

makeOPENMPI

@@ -58,7 +58,7 @@ _foamAddPath() { true; }
 WM_MPLIB=OPENMPI                                # Ensure we get the correct MPI
 
 # openmpi version from OpenFOAM etc/config.sh file:
-_foamEtc -config mpi
+_foamConfig mpi
 
 mpiPACKAGE=${FOAM_MPI:-openmpi-system}
 

makeParaView

@@ -37,7 +37,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 unset ParaView_VERSION                                   # Purge current values
 
 # ParaView_VERSION from etc/config.sh file:
-_foamEtc -config paraview
+_foamConfig paraview
 
 # Avoid any potential conflicts (especially if building from git)
 if [ -d "$ParaView_DIR" ]

makeVTK

@@ -40,7 +40,7 @@ cd ${0%/*} && wmakeCheckPwd "$WM_THIRD_PARTY_DIR" 2>/dev/null || {
 unset vtk_version mesa_version                           # Purge current values
 
 # vtk version from OpenFOAM etc/config.sh file:
-_foamEtc -config vtk
+_foamConfig vtk
 
 VTK_VERSION="$vtk_version"