From f35943a8a7f63642eca6333298365c91ff3c83e5 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 28 May 2009 20:39:03 +0100
Subject: [PATCH] Tidying up CGAL and boost inclusion. Removed the CGAL_PATH
variable, using CGAL_SRC for everything. Changed location of CGAL_FILES
"files".
Updated old meshers with new options.
in .bashrc using this environment:
~~~~~~~~~~~
export BOOST_LIB_VERSION=1_39
export BOOST_PATCH_LEVEL=_0
export BOOST_COMPILER=gcc43
export BOOST_VERSION=$BOOST_LIB_VERSION$BOOST_PATCH_LEVEL
export BOOST_ROOT=$WM_THIRD_PARTY_DIR/boost_$BOOST_VERSION
export CGAL_VERSION=3.4
export CGAL_SRC=$WM_THIRD_PARTY_DIR/CGAL-$CGAL_VERSION
~~~~~~~~~~~
and have written a script call makeCGAL to build and configure boost and CGAL:
~~~~~~~~~~~
BOOST_ARCH_PATH=${BOOST_ROOT}/platforms/${WM_OPTIONS}
cd ${BOOST_ROOT}
rm -rf ${BOOST_ARCH_PATH}
./bootstrap.sh \
--with-libraries=thread \
--libdir=$BOOST_ARCH_PATH/lib \
--includedir=$BOOST_ROOT/include
if [ -r /proc/cpuinfo ]
then
WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
[ $WM_NCOMPPROCS -le 8 ] || WM_NCOMPPROCS=8
time ./bjam -j $WM_NCOMPPROCS install
else
time ./bjam install
fi
echo "Done boost"
cd ${CGAL_SRC}
BOOST_VERSION_NO=`grep "#define BOOST_VERSION " \
${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}/boost/version.hpp \
| cut -d " " -f 3`
cmake \
-DGMP_INCLUDE_DIR=${WM_THIRD_PARTY_DIR}/gmp-4.2.4 \
-DGMP_LIBRARIES_DIR=${WM_THIRD_PARTY_DIR}/gmp-4.2.4/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib \
-DGMP_LIBRARIES=${WM_THIRD_PARTY_DIR}/gmp-4.2.4/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib/libgmp.so \
-DMPFR_INCLUDE_DIR=${WM_THIRD_PARTY_DIR}/mpfr-2.4.1 \
-DMPFR_LIBRARIES_DIR=${WM_THIRD_PARTY_DIR}/mpfr-2.4.1/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib \
-DMPFR_LIBRARIES=${WM_THIRD_PARTY_DIR}/mpfr-2.4.1/platforms/${WM_ARCH}${WM_COMPILER_ARCH}/lib/libmpfr.so \
-DBoost_INCLUDE_DIR=${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION} \
-DBoost_LIBRARY_DIRS=$BOOST_ARCH_PATH/lib \
-DBoost_THREAD_LIBRARY=$BOOST_ARCH_PATH/lib/libboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION}.so \
-DBoost_THREAD_LIBRARY_RELEASE=$BOOST_ARCH_PATH/lib/libboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION}.so \
-DBoost_VERSION=$BOOST_VERSION_NO \
${CGAL_SRC}
echo "\${CGAL_SRC}/src/CGAL/assertions.cpp" > ${CGAL_SRC}/src/CGAL/files
echo "\${CGAL_SRC}/src/CGAL/MP_Float.cpp" >> ${CGAL_SRC}/src/CGAL/files
echo "\${CGAL_SRC}/src/CGAL/Random.cpp" >> ${CGAL_SRC}/src/CGAL/files
echo "\${CGAL_SRC}/src/CGAL/io.cpp" >> ${CGAL_SRC}/src/CGAL/files
echo "Done CGAL"
---
.../utilities/mesh/generation/CV2DMesher/Make/options | 6 +++---
.../utilities/mesh/generation/CV3DMesher/Make/options | 6 +++---
applications/utilities/mesh/generation/cvMesh/Make/options | 2 +-
src/conformalVoronoiMesh/Make/options | 2 +-
wmake/rules/General/CGAL | 3 ---
5 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/applications/utilities/mesh/generation/CV2DMesher/Make/options b/applications/utilities/mesh/generation/CV2DMesher/Make/options
index d58ae360fd7..ff54c4ad912 100755
--- a/applications/utilities/mesh/generation/CV2DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV2DMesher/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
EXE_INC = \
${EXE_FROUNDING_MATH} \
@@ -16,10 +16,10 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
- -L$(BOOST_ROOT)/lib \
+ -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
-lmeshTools \
-ltriSurface \
-ldynamicMesh \
- -lboost_thread-gcc43-mt-1_38 \
+ -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION} \
-lmpfr
diff --git a/applications/utilities/mesh/generation/CV3DMesher/Make/options b/applications/utilities/mesh/generation/CV3DMesher/Make/options
index d58ae360fd7..ff54c4ad912 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV3DMesher/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
EXE_INC = \
${EXE_FROUNDING_MATH} \
@@ -16,10 +16,10 @@ EXE_INC = \
-I$(LIB_SRC)/triSurface/lnInclude
EXE_LIBS = \
- -L$(BOOST_ROOT)/lib \
+ -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
-lmeshTools \
-ltriSurface \
-ldynamicMesh \
- -lboost_thread-gcc43-mt-1_38 \
+ -lboost_thread-${BOOST_COMPILER}-mt-${BOOST_LIB_VERSION} \
-lmpfr
diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index fca28f43376..4b22e2542a3 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -18,7 +18,7 @@ EXE_INC = \
EXE_LIBS = \
-L$(WM_THIRD_PARTY_DIR)/mpfr-2.4.1/platforms/$(WM_ARCH)$(WM_COMPILER_ARCH)/lib \
- -L$(BOOST_ROOT)/lib \
+ -L$(BOOST_ROOT)/platforms/$(WM_OPTIONS)/lib \
-lconformalVoronoiMesh \
-lmeshTools \
-ledgeMesh \
diff --git a/src/conformalVoronoiMesh/Make/options b/src/conformalVoronoiMesh/Make/options
index 9168d12c6ed..6da893c424f 100644
--- a/src/conformalVoronoiMesh/Make/options
+++ b/src/conformalVoronoiMesh/Make/options
@@ -3,7 +3,7 @@ EXE_FROUNDING_MATH = -frounding-math
EXE_NDEBUG = -DNDEBUG
include $(GENERAL_RULES)/CGAL
-FFLAGS = -DCGAL_FILES='"${CGAL_PATH}/CGAL/files"'
+FFLAGS = -DCGAL_FILES='"${CGAL_SRC}/src/CGAL/files"'
EXE_INC = \
${EXE_FROUNDING_MATH} \
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 1429a755258..b31cd53a7fc 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -1,7 +1,4 @@
-CGAL_PATH = ${WM_THIRD_PARTY_DIR}/CGAL-${CGAL_VERSION}
-
CGAL_INC = \
-Wno-old-style-cast \
-I${CGAL_SRC}/include \
- -I${CGAL_PATH} \
-I${BOOST_ROOT}/include/boost-${BOOST_LIB_VERSION}
--
GitLab