Commit Graph

838 Commits

Author SHA1 Message Date
Sébastien Loriot 2ae34a22ba Merge remote-tracking branch 'cgal/6.1.x-branch' into 'cgal/main' 2025-08-13 18:09:36 +02:00
Sébastien Loriot f6b8d0faf3 fix license headers 2025-08-12 17:57:30 +02:00
Sébastien Loriot 4b9ca293c7 main will now target 6.2 2025-08-04 10:20:25 +02:00
Laurent Rineau 0435766dcf next on `master` will be CGAL-6.1-beta2, if needed 2025-07-09 13:07:03 +02:00
Laurent Rineau b2f6f03d3f update CGAL version to 6.1-beta1 2025-07-01 17:16:44 +02:00
Jane Tournois 0ab9d3eebf Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau
# Conflicts:
#	Installation/CHANGES.md
2025-06-10 11:18:38 +02:00
Andreas Fabri 851d03dadb merge master 2025-05-07 09:13:11 +01:00
Laurent Rineau 749903e4dc try to fix `error C2039: 'format_string': is not a member of 'std'` 2025-04-28 17:15:07 +02:00
Andreas Fabri 878aef67bf Replace #pragma once 2025-04-25 12:03:23 +01:00
Sebastien Loriot 1196ebdf8a more ranges workarounds for Apple clang 2025-04-09 14:45:04 +02:00
Andreas Fabri 7925d2a08b merge master 2025-04-08 11:49:02 +01:00
Sébastien Loriot cc77715588 Merge pull request #6849 from JulyCode/gsoc2022-isosurface
Isosurfacing_3 (new package)
2025-04-03 21:41:22 +02:00
Sébastien Loriot 6188aae5e5 Merge pull request #8259 from loic-dubois/Hyperbolic_surface_triangulation_2-dubois
Hyperbolic surface triangulation 2 (new package)
2025-04-03 19:18:58 +02:00
Mael Rouxel-Labbé 691fd789f9 Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2025-03-24 21:34:55 +01:00
Andreas Fabri 6eaeb7a148 merge cgal/master 2025-02-28 08:55:20 +00:00
Sébastien Loriot b589c88869 Merge remote-tracking branch 'cgal/master' into gsoc2023-hoskillua 2025-02-13 01:00:12 +01:00
Laurent Rineau a2571bbab8 Merge remote-tracking branch 'lrineau/CGAL-followup_PR_8170-lrineau' into Triangulation_3-CDT_3-lrineau 2025-02-11 18:26:52 +01:00
Laurent Rineau a45ac3eb69 fix the detection of <format> and std::format 2025-01-29 16:28:48 +01:00
Mael Rouxel-Labbé e86842189e Merge remote-tracking branch 'cgal/master' into Hyperbolic_surface_triangulation_2-dubois 2025-01-23 09:53:45 +01:00
Mael Rouxel-Labbé 9ec78ace1e Add license for T_OHS_2 2025-01-17 18:43:26 +01:00
Sébastien Loriot b32558b87e Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-12-16 11:47:34 +01:00
Andreas Fabri 07e98a69b4 Merge remote-tracking branch 'cgal/master' into Frechet-dev 2024-12-09 07:45:25 +00:00
Laurent Rineau 196f00c34b Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-12-04 11:27:05 +01:00
Laurent Rineau 7ae7f487d8 Merge branch 'master' into Triangulation_3-CDT_3-lrineau 2024-11-22 17:44:41 +01:00
Laurent Rineau da588c9f95 fix a comment in <CGAL/config.h> 2024-11-21 17:02:51 +01:00
Sébastien Loriot c050bb15a3 Merge remote-tracking branch 'cgal/master' 2024-11-15 11:41:07 +01:00
Laurent Rineau 02632017a5 Merge remote-tracking branch 'cgal/master' into Triangulation_3-CDT_3-lrineau 2024-11-12 12:33:37 +01:00
Sébastien Loriot 333a0df9d7 also add macro for unreachable 2024-11-08 18:06:42 +01:00
Sébastien Loriot 9f83f94530 assume from c++23 2024-11-08 18:04:24 +01:00
Laurent Rineau 096075ecfc master will now target 6.1 2024-10-21 17:45:41 +02:00
Sébastien Loriot e7b8a4eb17 Merge pull request #8523 from lrineau/CGAL_CGAL-protect_against_macro_free-GF
protect CGAL against macro `free`
2024-10-18 18:00:37 +02:00
Sébastien Loriot 619875392c Merge branch 'gsoc2023' into master 2024-10-18 14:33:31 +02:00
Sven Oesau a06002ab2b Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-10-14 14:42:46 +02:00
Laurent Rineau 9cdce85fbd
Re-add the test for `free`, since TBB has been updated on our Windows test machines 2024-10-14 14:10:49 +02:00
Sebastien Loriot ae35bab3ff
Mac OS X cleaning (#8536) 2024-10-14 10:56:25 +02:00
Sébastien Loriot 1c50e0bede Mac OS X cleaning 2024-10-10 14:21:34 +02:00
Andreas Fabri 42488c7876 free -> freelist; Comment define of _CRTDBG_MAP_ALLOC 2024-10-09 14:44:32 +01:00
Laurent Rineau 1f2f6c8e93 add testing with _CRTDBG_MAP_ALLOC 2024-10-08 12:49:14 +02:00
albert-github dd02af92a2 issue #8515 Spelling mistakes found checking `en-GB` to `en-US`
Spelling corrections, `en-GB` -> `en-US`
2024-10-05 11:28:29 +02:00
Laurent Rineau 30e1848c0a this branch will now target 6.0.1 2024-09-27 18:16:36 +02:00
Laurent Rineau ef77c4a6ff Prepare CGAL-6.0 2024-09-25 16:18:42 +02:00
Andreas Fabri baec5b0168 Merge branch 'master' into Frechet-dev 2024-08-14 10:50:37 +01:00
Laurent Rineau 600c63aca1 fix compilation with C++17 2024-07-09 01:37:41 +02:00
Laurent Rineau ed4fb14f74 merge master (WIP: need #8273) 2024-07-01 16:38:56 +02:00
Laurent Rineau 78a4865416 prepare for 6.0-beta2 2024-06-21 18:44:43 +02:00
Mael Rouxel-Labbé 67aba3fefe Merge remote-tracking branch 'cgal/master' into gsoc2022-isosurface 2024-06-20 10:18:49 +02:00
Andreas Fabri 2511d3c05b Fix license file 2024-06-18 13:29:51 +01:00
Andreas Fabri fdbb47b56c Rename package, remove default for epsilon 2024-06-18 08:30:17 +01:00
Andreas Fabri acad4997a9 merge master 2024-06-14 13:31:43 +01:00
Sébastien Loriot 61decadd31 Merge pull request #7908 from soesau/Kinetic_surface_reconstruction-new_package-soesau
Kinetic Surface Reconstruction
2024-05-26 17:53:54 +02:00