From 506dca54345c1af0862187d3e759f851ae98751d Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Thu, 23 Jun 2016 16:05:44 +0100
Subject: [PATCH] CGAL: Set to use the system CGAL installation by default
---
etc/config.csh/CGAL | 13 ++++++++++---
etc/config.csh/unset | 3 ++-
etc/config.sh/CGAL | 7 ++-----
etc/config.sh/unset | 3 ++-
4 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/etc/config.csh/CGAL b/etc/config.csh/CGAL
index fdff3cfa3a..895cfd8e80 100644
--- a/etc/config.csh/CGAL
+++ b/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
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index bb755277c6..bda01ef98d 100644
--- a/etc/config.csh/unset
+++ b/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
#------------------------------------------------------------------------------
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 893c30f638..5d6b2747ae 100644
--- a/etc/config.sh/CGAL
+++ b/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
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 7c8443f919..fa0a65b3fc 100644
--- a/etc/config.sh/unset
+++ b/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
#------------------------------------------------------------------------------
--
GitLab