svn+ssh://lrineau@scm.gforge.inria.fr/svn/cgal/branches/CGAL-3.6-branch
........
r56724 | stayeb | 2010-06-14 09:01:34 +0200 (Mon, 14 Jun 2010) | 14 lines
Backport from trunk:
| New Revision: 56647
| Author: stayeb
| Date: 2010-06-08 17:28:21 +0200 (Tue, 08 Jun 2010)
| Log message:
| Try another workaround for VC++ and Intel compiler (CGAL::centroid). Add a call of overloaded CGAL::centroid function in test-suite.
| New Revision: 56702
| Author: stayeb
| Date: 2010-06-11 09:41:10 +0200 (Fri, 11 Jun 2010)
| Log message:
| Fix VC++ workaround (tested with MSVS2005)
........
r56795 | lrineau | 2010-06-16 15:05:02 +0200 (Wed, 16 Jun 2010) | 35 lines
Backport fixes for VC10 from trunk:
| ------------------------------------------------------------------------
| r56726 | afabri | 2010-06-14 09:11:59 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Cartesian_kernel/include/CGAL/Cartesian/Cartesian_base.h
|
| For VC-10 we have to change FT* to cpp0x<>::const_iterator
| ------------------------------------------------------------------------
| ------------------------------------------------------------------------
| r56758 | lrineau | 2010-06-14 22:29:51 +0200 (Mon, 14 Jun 2010) | 11 lines
| Changed paths:
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
|
| Remove extra typename (broken testsuite) after revision 56725:
| | ------------------------------------------------------------------------
| | r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
| | Changed paths:
| | M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
| | M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
| | M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
| |
| | For VC-10 we have to change FT* to cpp0x<>::const_iterator
| | ------------------------------------------------------------------------
| ------------------------------------------------------------------------
| r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
|
| For VC-10 we have to change FT* to cpp0x<>::const_iterator
| ------------------------------------------------------------------------
........
r56796 | lrineau | 2010-06-16 15:10:30 +0200 (Wed, 16 Jun 2010) | 2 lines
Commit CHANGES for support of VC10.
........
r56797 | lrineau | 2010-06-16 15:14:49 +0200 (Wed, 16 Jun 2010) | 1 line
Commit mergeinfo stuff.
........
r56798 | lrineau | 2010-06-16 15:31:05 +0200 (Wed, 16 Jun 2010) | 60 lines
Backport from trunk the changes to the GMP/MPFR support on Windows:
- autolink now depends on CMake options CGAL_AUTO_LINK_GMP and
CGAL_AUTO_LINK_MPFR (default to ON).
- the environment variables GMP_INC_DIR GMP_LIB_DIR MPFR_INC_DIR
MPFR_LIB_DIR are used *before* searching into auxilary/gmp/.
- search names for libraries now includes libmpfr-1 and libgmp-10 (names
of Windows libraries obtained from the compilation of gmp-5.0.1 and
mpfr-2.4.2).
List of backported commits:
| ------------------------------------------------------------------------
| r56751 | lrineau | 2010-06-14 18:47:06 +0200 (Mon, 14 Jun 2010) | 6 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/CGALConfig_binary.cmake.in
| M /trunk/Installation/cmake/modules/CGAL_GeneratorSpecificSettings.cmake
| M /trunk/Installation/cmake/modules/CGAL_SetupGMP.cmake
| M /trunk/Installation/cmake/modules/FindGMP.cmake
| M /trunk/Installation/cmake/modules/FindMPFR.cmake
|
| Reintegrate the work of /branches/unsorted-branches/Test-no_autolink-for-gmp_mpfr-branch/Installation:
|
| If(MSVC), create CMake variables CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_GMP
| that can be set to OFF to disable the autolinking for GMP and MPFR. Those
| variables are stored in the cache, and in CGALConfig.cmake
|
| ------------------------------------------------------------------------
| r56752 | lrineau | 2010-06-14 18:51:25 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.fhs.in
| M /trunk/Installation/cmake/modules/CGALConfig_install.cmake.source.in
|
| Patch all CGALConfig*.in the same way.
| ------------------------------------------------------------------------
| r56775 | lrineau | 2010-06-15 19:25:37 +0200 (Tue, 15 Jun 2010) | 3 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/FindGMP.cmake
| M /trunk/Installation/cmake/modules/FindMPFR.cmake
|
| Fix the library names hints of gmp and mpfr in FindMPFR.cmake and
| FindGMP.cmake
|
| ------------------------------------------------------------------------
| r56777 | lrineau | 2010-06-15 20:10:23 +0200 (Tue, 15 Jun 2010) | 2 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/FindGMP.cmake
|
| The env variable must be searched *before* auxiliary/gmp/...
|
| ------------------------------------------------------------------------
| r56778 | lrineau | 2010-06-15 20:10:56 +0200 (Tue, 15 Jun 2010) | 2 lines
| Changed paths:
| M /trunk/Installation/cmake/modules/FindMPFR.cmake
|
| Search the library also in auxiliary/gmp, even if autolink=OFF.
|
| ------------------------------------------------------------------------
........
r56808 | lrineau | 2010-06-16 18:10:11 +0200 (Wed, 16 Jun 2010) | 4 lines
Set CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_MPFR defaults to FALSE if MSVC10
(because GeometryFactory has not generated any autolink-enabled binaries
of gmp and mpfr for msvc-2010).
........
--create an internally used vector that can reserve its size when constructed
--create an internally used class to store information required to emulated the call stack
--the stack used to emulate the call stack is a static thread-safe vector of the function (thus a memory overhead)
These choices have been made so that the running time of the triangulation is still the same.
| ------------------------------------------------------------------------
| r56725 | afabri | 2010-06-14 09:08:25 +0200 (Mon, 14 Jun 2010) | 1 line
| Changed paths:
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/Homogeneous_base.h
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH2.h
| M /trunk/Homogeneous_kernel/include/CGAL/Homogeneous/VectorH3.h
|
| For VC-10 we have to change FT* to cpp0x<>::const_iterator
| ------------------------------------------------------------------------
If(MSVC), create CMake variables CGAL_AUTO_LINK_GMP and CGAL_AUTO_LINK_GMP
that can be set to OFF to disable the autolinking for GMP and MPFR. Those
variables are stored in the cache, and in CGALConfig.cmake
Fernando Cacciola
Andreas Fabri
Sébastien Loriot
Laurent Rineau
Stéphane Tayeb
Olivier Devillers
Efi Fogel
Michael Hemmer