Commit Graph

424 Commits

Author SHA1 Message Date
Laurent Rineau 04bef2b071 Merge pull request #3781 from sloriot/CGAL-update_for_cpp14
Update for cpp14
2019-04-08 15:59:28 +02:00
Laurent Rineau 3a32f3f3ef Restore CGAL::cpp11 temporarily
This reverts commit 04978d8aae.
2019-04-01 18:27:35 +02:00
Laurent Rineau e09f692e74 master now targets CGAL 5.0 2019-03-29 16:02:15 +01:00
Laurent Rineau 99ca804f6d Maybe tonight's internal release will be CGAL-4.14 final 2019-03-28 16:45:09 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Laurent Rineau e9f36ff557 Prepare for CGAL-4.14-beta4 2019-03-27 18:03:07 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 43d1948396 master now targets a possible CGAL-4.14-beta3 2019-03-13 17:15:45 +01:00
Laurent Rineau 911e44a1fe Prepare for beta2 2019-03-04 18:35:48 +01:00
Laurent Rineau 01e5727a50 Prepare CGAL-4.14-beta1 2019-03-01 16:27:11 +01:00
Laurent Rineau 5199eb70ee Merge pull request #3283 from imiordanov/Periodic_4_hyperbolic_triangulation_2-IIordanov
New packages: Hyperbolic_triangulation_2 / Periodic_4_hyperbolic_triangulation_2
2019-02-22 16:39:12 +01:00
Andreas Fabri b84f54a9e3 Do not define the macro CGAL_CFG_NO_CPP0X_DELETED_AND_DEFAULT_FUNCTIONS for VC2013 as suggested in Issue #3436 2019-02-08 09:46:18 +01:00
Maxime Gimeno 549568a954 Fix conflicts 2019-01-22 10:08:48 +01:00
Laurent Rineau f5a8686cf3 Merge pull request #3439 from aboudev/VSA-lingjie
New package: Surface_mesh_approximation
2019-01-22 09:17:35 +01:00
Maxime Gimeno d52718f312 Fix Conflicts 2019-01-21 10:03:31 +01:00
Mael Rouxel-Labbé 15fe22cc6d Micro fix to gpl.h.in and added licenses for HT_2 and P4HT_2
(re-generated all the licenses on the way)
2018-12-19 18:38:05 +01:00
Lingjie Zhu 73c2a418c6 fix SPDX license indentifier 2018-11-30 10:45:24 +01:00
Lingjie Zhu a4ef69a631 add package license 2018-11-30 15:24:16 +08:00
Andreas Fabri 5b62f06871 Fix merge conflicts 2018-11-12 13:02:52 +01:00
Sébastien Loriot e179770aab add skeleton for collision detection in PMP 2018-10-09 10:28:43 +02:00
Laurent Rineau 7cf19af58f `master` now targets CGAL-4.14 2018-10-01 15:11:49 +02:00
Laurent Rineau 48bb90a36e Polish CGAL-4.13 2018-10-01 10:55:07 +02:00
Laurent Rineau ac173dfe44 Prepare CGAL-4.13 2018-09-12 11:07:03 +02:00
Laurent Rineau 17fc9631cf Prepare CGAL-4.13-beta2, if needed 2018-08-01 16:22:31 +02:00
Maxime Gimeno 8d0a67095f Merge branch 'master' into IntrinsicFaceGraph-V2 2018-08-01 15:40:36 +02:00
Laurent Rineau f1e926e689 Update <CGAL/version.h> (for full header-only) 2018-07-31 16:26:54 +02:00
Laurent Rineau 10a84aa34e Merge branch 'master' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-27 10:33:24 +02:00
Laurent Rineau c68cf8fc4c Merge pull request #3129 from sgiraudot/Point_set_processing-Callbacks-GF
Point Set Processing: Callbacks
2018-06-27 10:21:40 +02:00
Simon Giraudot 24ac59a01c Avoid using std::unordered_set for MSVC2013 as performances can be very bad
See: https://medium.com/plaxis/embarrassingly-poor-performance-of-regular-point-sets-with-std-unordered-set-418cb413974b
2018-06-21 16:11:03 +02:00
Maxime Gimeno 4e8264b109 Merge CGAL/master to get rid of the dependency to QGLViewer 2018-06-11 12:10:57 +02:00
Mael Rouxel-Labbé ddeb4c0cd7 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-07 15:14:19 +02:00
Laurent Rineau 7f45dbebe6 Merge pull request #3058 from maxGimeno/Property_map-Point_kernel_converter_map-GF
Property_map: Kernel_converter_map
2018-06-06 14:41:46 +02:00
Mael Rouxel-Labbé 7ea3a8044e Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-06-05 14:39:18 +02:00
Simon Giraudot 6480cf2205 Define a CGAL::cpp11::thread wrapper for TBB or STD 2018-05-29 11:42:04 +02:00
Laurent Rineau cb14375778
Merge branch 'master' into Property_map-Point_kernel_converter_map-GF 2018-05-29 10:58:28 +02:00
Laurent Rineau 2766e1ff5d Merge 'master' and fix conflicts 2018-05-28 16:40:09 +02:00
Laurent Rineau 588cc67897 Merge pull request #3096 from MaelRL/CGAL-Fix_deprecated_code_usage-GF
Fix some deprecation-related issues
2018-05-28 13:58:41 +02:00
Andreas Fabri dd8bf1f4df Add a constructor and two functions to get started 2018-05-24 14:35:35 +01:00
Mael Rouxel-Labbé b41f1d6272 Various deprecation-related improvements 2018-05-18 16:47:54 +02:00
Maxime Gimeno 8df643f390 update licenses 2018-05-17 10:20:56 +02:00
Laurent Rineau 05d7baceb1
Merge branch 'master' into Mesh_3-improve_polylines_to_protect-GF 2018-05-16 11:36:24 +02:00
Sébastien Loriot 4d00a8e070 Merge branch 'cgal/releases/CGAL-4.12-branch' 2018-05-15 22:32:45 +02:00
Laurent Rineau 6c477af5f9
Merge branch 'master' into Property_map-Point_kernel_converter_map-GF 2018-05-15 16:08:01 +02:00
Andreas Fabri b33ab791e1 Disable a warning. Fix an allocator call 2018-05-15 15:37:51 +02:00
Laurent Rineau 01ab4856b0 Set BOOST_PARAMETER_MAX_ARITY very early 2018-05-15 14:56:21 +02:00
Sébastien Loriot 8bc315c974 make it work with any Kernel object 2018-05-03 15:05:47 +02:00
Maxime Gimeno a7721389b2 Forward declare the Cartesian_converter to avoid messing with the dependencies tree. 2018-04-27 09:59:25 +02:00
Mael Rouxel-Labbé 17d46e9211 Merge branch 'Periodic_3_mesh_3-Feature-MBogdanov-old' into Periodic_3_mesh_3-Feature-MBogdanov 2018-04-26 11:55:17 +02:00
Laurent Rineau 7ff5a2adfa Next version on master will be 4.13-beta1 2018-04-25 18:08:11 +02:00
Laurent Rineau 4f14095cb8 next version on this branch is 4.12.1 2018-04-25 18:06:14 +02:00