From 579f559aa7c538620284f77a1b4b2d2ce1e5e76e Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 1 Jul 2016 16:22:28 +0100
Subject: [PATCH] Correct handling of the CGAL version variable for makeCGAL in
ThirdParty
---
applications/utilities/mesh/generation/Allwmake | 4 ----
etc/bashrc | 5 +++++
etc/config.sh/CGAL | 4 ++--
etc/cshrc | 4 ++++
4 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index ea140785b99..9749745acd1 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/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
diff --git a/etc/bashrc b/etc/bashrc
index f05fcea88f0..4df0d6c3754 100644
--- a/etc/bashrc
+++ b/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
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index e61f8c82390..6a942592239 100644
--- a/etc/config.sh/CGAL
+++ b/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
#------------------------------------------------------------------------------
diff --git a/etc/cshrc b/etc/cshrc
index 22537fc3269..c2f17948b13 100644
--- a/etc/cshrc
+++ b/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
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--
GitLab