Commit Graph

1933 Commits

Author SHA1 Message Date
Andreas Fabri 6e36a853a9 Merge branch 'Surface_mesh-new_package-GF'
Approved by the release manager
Conflicts:
	Documentation/doc/Documentation/dependencies
	Documentation/resources/how_to_cite_cgal.bib.in
	Installation/changes.html
2015-01-12 11:27:35 +01:00
Sébastien Loriot d2e0dca2f9 update changes 2015-01-09 12:36:07 +01:00
Sébastien Loriot 43e8fae5f8 cosmetic changes 2015-01-09 10:49:26 +01:00
Sébastien Loriot 0218954ea6 Merge branch 'barycentric_coordinates_2-dmitry'
Tested in CGAL-4.6-Ic-99 and CGAL-4.6-Ic-100
  Approved by the release manager

Conflicts:
	Installation/changes.html
	Kernel_23/include/CGAL/internal/Projection_traits_3.h
2015-01-09 10:35:20 +01:00
Clement Jamin e0b402b094 Merge branch 'Triangulation-higher_dimensions-odevil_shornus'
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Triangulation_d
Tested in CGAL-4.6-Ic-98
Approved by the release manager
2015-01-08 18:15:34 +01:00
Remy Thomasse 02ab5261bc Approved by the Release Manager
Merge branch 'Generators_convex-rthomass'
2015-01-08 15:46:24 +01:00
Sylvain Brandel 9a6ed32a15 Merge branch 'Combinatorial_map-update_attributes-sbrandel'
- corresponding to small feature "Combinatorial map update attributes"
   https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Combinatorial_map_update_attributes
- succesfully tested, release number CGAL-4.6-lc-99
- Approved by the Release Manager

Conflicts:
	Installation/changes.html
2015-01-08 14:48:47 +01:00
Sylvain Brandel 92681aae83 added changes in Installation/changes.html 2015-01-07 16:21:16 +01:00
Remy Thomasse f85647f666 changes.html 2015-01-06 17:04:30 +01:00
Dmitry Anisimov 8e4a486024 Updated file changes.html. 2014-12-29 16:40:15 +01:00
Dmitry Anisimov 7d9f7bcf9c Test update and modification of the file changes.html. 2014-12-29 16:16:30 +01:00
Andreas Fabri 476fadca6a Add Surface_mesh to changes.html 2014-12-22 18:05:42 +01:00
Clement Jamin 7a06a08ca4 Update doc to state that ICC prior to version 15 is not supported for Epick_d
Approved by the Release Manager
2014-12-18 12:42:34 +01:00
Clement Jamin 315ffdcbc8 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-12-18 09:32:23 +01:00
Laurent Rineau c043a0dca9 Merge branch 'Installation-Boost_DEBUG-lrineau'
Add Boost_DEBUG as a CMake advanced option.
2014-12-17 17:08:43 +01:00
Sébastien Loriot 79d2f2383c update changes 2014-12-16 11:52:59 +01:00
Jane Tournois f3ab2cf92d Merge branch 'to-be-tested/Triangulation_3-determinism-gf'
make Triangulation_3 deterministic from platform to platform
on degenerate cases

Approved by the release manager
2014-12-15 14:01:45 +01:00
Jane Tournois 6b6af12353 fix the BOOST_JOIN parse error in demos
somehow, boost/random.hpp includes boost/type_traits/has_binary_operator.hpp,
and the "parse error" happens in this file (as said in the bug report)

Also update the link to the official Qt bug report
2014-12-11 12:17:44 +01:00
Sébastien Loriot 3972130053 update changes.html 2014-12-11 08:50:21 +01:00
Laurent Rineau 09da20c021 Merge branch 'Mesh_3-fix_integer_overflow-jtournoi'
this branch fixes Image_IO for large images, when the
dimensions do not fit in 'unsigned int'
'size_t' is now used everywhere that deals with image sizes
and pixel/voxel coordinates

fix suggested by a CGAL user

Tested in CGAL-4.6-Ic-64.
Approved by the Release Manager.
2014-11-28 12:33:40 +01:00
Laurent Rineau 8231a36e89 Add Boost_DEBUG as an advanced OPTION 2014-11-28 12:09:14 +01:00
Clement Jamin c6de2a50b2 Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-11-20 19:19:23 +01:00
Laurent Rineau 7d63f9d072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
	Maintenance/release_building/public_release_name
2014-11-06 10:47:45 +01:00
Laurent Rineau d85eaa327c Merge remote-tracking branch 'origin/Mesh_3-fix_exuder_holes_on_surface-GF' into releases/CGAL-4.5-branch
Bug-fix for Mesh_3:
  Fix a bug in the sliver exudation preservation of boundaries.

Approved by the Release Manager.
2014-10-31 11:32:09 +01:00
Jane Tournois df0ec2e54d mention exuder bug fix in changes.html 2014-10-21 11:29:07 +02:00
Laurent Rineau 908d608072 Merge branch 'releases/CGAL-4.5-branch'
Conflicts:
	Installation/changes.html
2014-10-20 14:46:36 +02:00
Laurent Rineau 52c4437539 This branch needs to bump the SONAME 2014-10-20 14:41:14 +02:00
Laurent Rineau 8d61c8db07 Add comments (following the manual chapters) 2014-10-06 16:52:22 +02:00
Laurent Rineau f5d89b443e Update CHANGES 2014-10-06 16:46:28 +02:00
Sébastien Loriot aabd9dc557 update changes 2014-09-29 08:44:51 +02:00
Sébastien Loriot 377342b311 add backward compatibility class/doc/test 2014-09-23 11:34:47 +02:00
Clement Jamin 0040d62791 Update changes.html 2014-09-18 15:09:41 +02:00
Clement Jamin 8f259e5dea Merge branch 'Triangulation-higher_dimensions-odevil_shornus-old' into Triangulation-higher_dimensions-odevil_shornus 2014-09-09 11:20:33 +02:00
Laurent Rineau 58e1779c1e Prepare future final release 4.5 2014-08-29 15:22:35 +02:00
Laurent Rineau 311b505cad Update the comment about the SOversion
Trivial fix for master
2014-08-18 15:35:17 +02:00
Laurent Rineau d4bdae3077 Prepare CGAL-4.5-beta1 2014-08-12 19:09:57 +02:00
Laurent Rineau daa20fd1aa Better tests
Current version of leda-numbers still fails. :-(
2014-08-11 19:55:21 +02:00
Laurent Rineau 3ae8979318 Add a test for LEDA
When LEDA is available, that test program tests very basic I/O
operations of `leda::rational`. That also tests the link with LEDA.
2014-08-11 19:55:21 +02:00
Andreas Fabri 9b0a59972f Support for LEDA_numbers on Windows
trivial fix for master (and approved by the Release Manager)
2014-08-07 14:16:38 +02:00
Laurent Rineau 865eee70f7 Support LEDA with thread-support
If one use a library of LEDA that support threads, without setting
LEDA_MULTI_THREAD, then one can get segfaults when creating new LEDA
objects.
2014-08-04 15:53:58 +02:00
Laurent Rineau 6cba91ac8f Recode changes.html to UTF-8.
And update CHANGES.
2014-08-01 14:12:55 +02:00
Laurent Rineau 3214507a45 Merge branch 'CGAL-fix_cmake_3-GF'
Add the compatibility with CMake 3.0, without using any new feature.

Tested in CGAL-4.5-Ic-104.

Approved by the Release Manager.
2014-08-01 14:11:02 +02:00
Sébastien Loriot 2b6fa0076a Merge branch 'BGL-fix_halfedge_edge_is_border_pmap-sloriot'
Tested in CGAL-4.5-Ic-105

Approved by the (interim) release manager
2014-07-24 20:41:06 +02:00
Sébastien Loriot cc36cf8359 Merge branch 'boost-work_around_dijktra_bug_1.54-local'
Distribute dijktra header file from boost 1.55 to work around
  a bug in the version 1.54. The header file is only used if the
  user compiles with boost 1.54

Tested in CGAL-4.5-Ic-102
Approved by the release manager

Conflicts:
	Installation/changes.html
2014-07-23 08:46:33 +02:00
Sébastien Loriot cdec3d6414 make the edge_descriptor of Polyhedron hashable 2014-07-23 08:20:16 +02:00
Laurent Rineau 926aa7500f Set CMP0042 to OLD
That avoids a warning on MacOS.
2014-07-22 15:14:52 +02:00
Laurent Rineau 3dd4069bf0 Fix a bug with CMake 3.0
Actually, in my opinion that was also a bug with other versions of
CMake.

Before this commit, in Installation/src, CGAL_CONFIGURED_LIBRARIES was
set to the empty string "" *in the parent scope* (Installation),
then the variable is modified in the current scope Installation/src, and
then the variable value is copied to a cache variable of the same name.

In my opinion, that means that the parent scope (Installation) has a
non-cache variable CGAL_CONFIGURED_LIBRARIES that is empty (""), and a
cache variable that is not empty (that contains, for example
"CGAL_Core;CGAL_Qt4;CGAL_ImageIO"). The document of CMake-3.0 precisely says
that the semantic of variables is such that cache variables have the
lowest priority. See:
  http://www.cmake.org/cmake/help/v3.0/manual/cmake-language.7.html#variables
As far as I know, that was supposed to be the same for CMake 2.8, but I
cannot find out where it is described in the documentation. Anyway, the
bug was visible with CMake 2.8 and not with CMake 3.0.

The patch simply does not set the empty value of
CGAL_CONFIGURED_LIBRARIES in the parent scope, but only in the current
local scope.
2014-07-22 15:04:12 +02:00
Laurent Rineau 4d468d1881 Add compatibility with CMake 3.0
Trivial bug-fix for master
2014-07-22 12:47:59 +02:00
Sébastien Loriot 5c6b54257a the XXX_is_border properties are removed + add missing replacement functions 2014-07-22 12:00:15 +02:00
Laurent Rineau da77e0d819 Name of leda_numbers of Windows
Trivial fix for master

(cherry picked from commit 601d05d717edead7ea8396a0f723b715bbd9bdc6)
2014-07-21 14:00:59 +02:00