Correct handling of the CGAL version variable for makeCGAL in ThirdParty

applications/utilities/mesh/generation/Allwmake

@@ -11,10 +11,6 @@ wmake -all $targetType snappyHexMesh
 
 if [ -n "$FOAMY_HEX_MESH" ]
 then
-    # Get CGAL and boost versions
-    . $WM_PROJECT_DIR/etc/config.sh/functions
-    _foamEval $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
-
     foamyMesh/Allwmake $targetType $*
 fi
 

etc/bashrc

@@ -172,6 +172,11 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/ensight`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/gperftools`
 
+if [ ! -z "$FOAMY_HEX_MESH" ]
+then
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL`
+fi
+
 
 # Clean environment paths again. Only remove duplicates
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

etc/config.sh/CGAL

@@ -38,7 +38,7 @@
 
 boost_version=boost-system
 cgal_version=cgal-system
-#cgal_version=CGAL-4.8
+#cgal_version=CGAL-4.8.1
 
 thirdPartyPath=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER
 
@@ -61,6 +61,6 @@ then
     echo "    $cgal_version at $CGAL_ARCH_PATH" 1>&2
 fi
 
-unset boost_version cgal_version thirdPartyPath
+unset thirdPartyPath
 
 #------------------------------------------------------------------------------

etc/cshrc

@@ -218,6 +218,10 @@ _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/mpi`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/paraview`
 _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/ensight`
 
+if ( ($?FOAMY_HEX_MESH) ) then
+    _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config.csh/CGAL`
+endif
+
 
 # Clean environment paths again. Only remove duplicates
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~