|
|
f35943a8a7
|
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"
|
2009-05-28 20:39:03 +01:00 |
|
|
|
901bd023c3
|
Modifying options for building with boost to make sure that the ThirdParty
version is being used.
|
2009-05-28 17:35:47 +01:00 |
|
|
|
67f828d299
|
Changed to gcc 4.3.3, linking mpfr from ThirdParty to CV3DMesher.
|
2009-03-30 17:00:28 +01:00 |
|
|
|
2a424fddab
|
using Graham's latest CGAL wmake rules
|
2008-07-24 14:40:53 +01:00 |
|
|
|
3170c7c0c9
|
Creation of OpenFOAM-dev repository 15/04/2008
|
2008-04-15 18:56:58 +01:00 |
|
