From 08488007afde4073f60f5219203f240d8d3ef470 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 22 Feb 2010 16:00:54 +0000
Subject: [PATCH] COMP: CGAL and boost build and environment options.

---
 .../mesh/generation/cvMesh/Make/options       |  4 +--
 etc/settings.csh                              | 29 +++++++++++++-----
 etc/settings.sh                               | 30 ++++++++++++++-----
 src/mesh/conformalVoronoiMesh/Make/options    |  1 -
 wmake/rules/General/CGAL                      |  9 +++++-
 5 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 8a3f321499..a8d2d61b65 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -8,7 +8,6 @@ EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
-    -I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
     -I$(LIB_SRC)/mesh/conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -17,8 +16,7 @@ EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
-    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
+    $(CGAL_LIBS) \
     -lconformalVoronoiMesh \
     -lmeshTools \
     -ledgeMesh \
diff --git a/etc/settings.csh b/etc/settings.csh
index d285e07ca2..0a425f8514 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -88,17 +88,23 @@ case OpenFOAM:
     switch ("$WM_COMPILER")
     case Gcc:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2
+        setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
     breaksw
     case Gcc442:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
+        setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
     breaksw
     case Gcc43:
         setenv WM_COMPILER_DIR $WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        setenv MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
+        setenv MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
     breaksw
     case Gcc42:
@@ -245,11 +251,18 @@ else
 endif
 
 
-# CGAL library if available
-# ~~~~~~~~~~~~~~~~~~~~~~~~~
-if ( $?CGAL_LIB_DIR ) then
-    _foamAddLib $CGAL_LIB_DIR
-endif
+# CGAL and boost
+# ~~~~~~~~~~~~~~
+set cgal_version=3.5.1
+setenv CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version
+
+set boost_version=1_42_0
+setenv BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version
+
+_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
+_foamAddLib $CGAL_SRC/lib
+
+unset cgal_version boost_version
 
 
 # Switch on the hoard memory allocator if available
diff --git a/etc/settings.sh b/etc/settings.sh
index bb0d48df0e..275638762c 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -112,22 +112,30 @@ OpenFOAM)
     case "$WM_COMPILER" in
     Gcc)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.2
+        export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-5.0.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         ;;
     Gcc442)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
+        export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         ;;
     Gcc44)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.4.2/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
+        export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         ;;
     Gcc43)
         export WM_COMPILER_DIR=$WM_THIRD_PARTY_DIR/gcc-4.3.3/platforms/$WM_ARCH$WM_COMPILER_ARCH
-        _foamAddLib $WM_THIRD_PARTY_DIR/mpfr-2.4.1/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
+        export MPFR_HOME=$WM_THIRD_PARTY_DIR/mpfr-2.4.1
+        export MPFR_ARCH_PATH=$MPFR_HOME/platforms/$WM_ARCH$WM_COMPILER_ARCH
+        _foamAddLib $MPFR_ARCH_PATH/lib
         _foamAddLib $WM_THIRD_PARTY_DIR/gmp-4.2.4/platforms/$WM_ARCH$WM_COMPILER_ARCH/lib
         ;;
     Gcc42)
@@ -281,10 +289,18 @@ fi
 export MPI_BUFFER_SIZE
 
 
-# CGAL library if available
-# ~~~~~~~~~~~~~~~~~~~~~~~~~
-[ -d "$CGAL_LIB_DIR" ] && _foamAddLib $CGAL_LIB_DIR
+# CGAL and boost
+# ~~~~~~~~~~~~~~
+cgal_version=3.5.1
+export CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$cgal_version
 
+boost_version=1_42_0
+export BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$boost_version
+
+_foamAddLib $BOOST_ROOT/platforms/$WM_OPTIONS/lib
+_foamAddLib $CGAL_SRC/lib
+
+unset cgal_version boost_version
 
 # Switch on the hoard memory allocator if available
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/src/mesh/conformalVoronoiMesh/Make/options b/src/mesh/conformalVoronoiMesh/Make/options
index 6da893c424..013eba536d 100644
--- a/src/mesh/conformalVoronoiMesh/Make/options
+++ b/src/mesh/conformalVoronoiMesh/Make/options
@@ -9,7 +9,6 @@ EXE_INC = \
     ${EXE_FROUNDING_MATH} \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
-    -I$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1 \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index b31cd53a7f..d13caeaf24 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,4 +1,11 @@
 CGAL_INC = \
     -Wno-old-style-cast \
     -I${CGAL_SRC}/include \
-    -I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}
+    -I$(MPFR_HOME) \
+    -I${BOOST_ROOT}/include/boost
+
+CGAL_LIBS = \
+    -L$(MPFR_ARCH_PATH)/lib \
+    -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
+    -lmpfr \
+    -lboost_thread