CGAL: Set to use the system CGAL installation by default

etc/config.csh/CGAL

@@ -28,10 +28,17 @@
 #     Setup file for CGAL (& boost) include/libraries.
 #     Sourced from OpenFOAM-<VERSION>/etc/cshrc
 #
+#     If using system-wide installations for either one, use the following
+#     version settings:
+#
+#         boost_version=boost-system
+#         cgal_version=cgal-system
+#
 #------------------------------------------------------------------------------
 
 set boost_version=boost-system
-set cgal_version=CGAL-4.8
+set cgal_version=cgal-system
+#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
@@ -42,11 +49,11 @@ if ($?FOAM_VERBOSE && $?prompt) then
     echo "    $boost_version at $BOOST_ARCH_PATH"
 endif
 
-if ( -d "$CGAL_ARCH_PATH" ) then
+if ( -d "$CGAL_ARCH_PATH" && "$cgal_version" != "cgal-system" ) then
     _foamAddLib $CGAL_ARCH_PATH/lib
 endif
 
-if ( -d "$BOOST_ARCH_PATH" ) then
+if ( -d "$BOOST_ARCH_PATH" && "$boost_version" != "boost-system" ) then
     _foamAddLib $BOOST_ARCH_PATH/lib
 endif
 

etc/config.csh/unset

@@ -127,10 +127,11 @@ unsetenv PV_PLUGIN_PATH
 
 
 #------------------------------------------------------------------------------
-# Unset CGAL-related environment variables
+# Unset foamyHexMesh-related environment variables
 
 unsetenv BOOST_ARCH_PATH
 unsetenv CGAL_ARCH_PATH
+unsetenv FOAMY_HEX_MESH
 
 
 #------------------------------------------------------------------------------

etc/config.sh/CGAL

@@ -34,14 +34,11 @@
 #         boost_version=boost-system
 #         cgal_version=cgal-system
 #
-# Note
-#     If CGAL/Boost is to be entirely disabled, either rename this file or
-#     create an empty one with the same name at a user or site location.
-#
 #------------------------------------------------------------------------------
 
 boost_version=boost-system
-cgal_version=CGAL-4.8
+cgal_version=cgal-system
+#cgal_version=CGAL-4.8
 
 if [ -z "$SOURCE_CGAL_VERSIONS_ONLY" ]
 then

etc/config.sh/unset

@@ -117,10 +117,11 @@ unset PV_PLUGIN_PATH
 
 
 #------------------------------------------------------------------------------
-# Unset CGAL-related environment variables
+# Unset foamyHexMesh-related environment variables
 
 unset BOOST_ARCH_PATH
 unset CGAL_ARCH_PATH
+unset FOAMY_HEX_MESH
 
 
 #------------------------------------------------------------------------------