Skip to content
Snippets Groups Projects
  1. Apr 02, 2012
  2. Mar 27, 2012
  3. Jul 22, 2011
  4. May 13, 2011
  5. Feb 26, 2010
  6. Feb 23, 2010
  7. Feb 22, 2010
  8. Dec 22, 2009
  9. Oct 21, 2009
  10. Oct 20, 2009
  11. May 28, 2009
    • graham's avatar
      Tidying up CGAL and boost inclusion. Removed the CGAL_PATH variable, using · f35943a8
      graham authored
      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"
      f35943a8
    • graham's avatar
      Modifying options for building with boost to make sure that the ThirdParty · 901bd023
      graham authored
      version is being used.
      901bd023
  12. Apr 08, 2009
  13. Apr 03, 2009
  14. Apr 01, 2009
  15. Mar 30, 2009
  16. Mar 20, 2009
  17. Mar 18, 2009
  18. Mar 17, 2009
  19. Feb 24, 2009
  20. Feb 11, 2009
  21. Feb 09, 2009
    • graham's avatar
      Using CGAL-3.4. Requires to be linked to compiled boost thread library. In... · bb278906
      graham authored
      Using CGAL-3.4.  Requires to be linked to compiled boost thread library.  In this commit it is hard-coded to -lboost_thread-gcc43-mt-1_37, i.e. boost version 1.37.0, will need to be parameterised.  CGAL does not need to be compiled, as before, and needs the CGAL-3.4/src/files file as before, but the compiler_config.h file, written by cmake, is now included from CGAL/3.4/include/CGAL, where it has been editted to remove the use of GMP.  To use the CMP libraries, add -lgmpxx -lmpfr -lgmp to Make/options - there is little (2%) obvious performance benefit to creating a DT with GMP.  -frounding-math is a required option  - when running in debug assertions failures occur without it when using an exact construction.
      bb278906
  22. Jan 21, 2009
  23. Dec 20, 2008
  24. Oct 03, 2008
    • graham's avatar
      Fixed small logic error in smoothEdges that meant that point groups at the... · e9b537ad
      graham authored
      Fixed small logic error in smoothEdges that meant that point groups at the start and end of the edge weren't handled properly.  Changed from compiling with FULLDEBUG.  Using the exact kernel because dualisation was causing CGAL to fail an assertion.  Going to examine the failing tets and try to check and intervene if possible so the inexact kernel can be used again.
      e9b537ad
  25. Jul 24, 2008
  26. Jul 09, 2008