From f09aa2ebdc2984217a725864abe2ff14aca0f6ac Mon Sep 17 00:00:00 2001
From: mark <mark@opencfd>
Date: Fri, 17 Jun 2016 16:59:53 +0200
Subject: [PATCH] ENH: SOURCE_CGAL_VERSIONS_ONLY workaround replaced in
 OpenFOAM

Unset the _foamAddLib function prior to sourcing config.sh/CGAL

DOC: restriction about mixing ThirdParty and system gmp/mpfr
     does not apply anymore.
---
 makeCGAL | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/makeCGAL b/makeCGAL
index 4e58844..8203b8c 100755
--- a/makeCGAL
+++ b/makeCGAL
@@ -34,14 +34,13 @@
 #     simply specify a 'system' version. For example,
 #         makeCGAL boost-system gmp-system
 #
-#     Mixing system and ThirdParty for gmp/mpfr is not supported.
-#
 #------------------------------------------------------------------------------
 
 # Get CGAL, boost and gmp/mpfr versions
 . $WM_PROJECT_DIR/etc/config.sh/functions
-_foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
-          $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
+unset _foamAddPath _foamAddLib _foamAddMan # get settings only
+
+_foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/CGAL)
 _foamSource $($WM_PROJECT_DIR/bin/foamEtcFile config.sh/compiler)
 
 boostPACKAGE=${boost_version:-boost-system}
@@ -83,8 +82,6 @@ To override this behaviour (and use the system boost and/or gmp/mpfr),
 simply specify a 'system' version. For example,
     $Script boost-system gmp-system
 
-Note: mixing system and ThirdParty for gmp/mpfr is not supported.
-
 USAGE
     exit 1
 }