Commit Graph

4975 Commits

Author SHA1 Message Date
hoskillua a94a7337c2 Merge remote-tracking branch 'upstream/master' into gsoc2022 2023-08-25 14:51:46 +03:00
Laurent Rineau 9f68b1a0be TBB is a SYSTEM library, and CGAL::CGAL is not 2023-08-24 16:48:22 +02:00
Laurent Rineau a12a0fafa9 TBB is a SYSTEM library 2023-08-24 15:29:47 +02:00
Sébastien Loriot 68bc244d02 Merge remote-tracking branch 'cgal/master' into HEAD 2023-08-24 14:14:12 +02:00
Efi Fogel aba2d147f8 Merge remote-tracking branch 'cgal/master' into Aos_2-fixes-efif 2023-08-22 13:41:57 +03:00
Andreas Fabri a0255568dd Update changes.md 2023-08-21 11:09:45 +01:00
Efi Fogel 3b84bd05f8 Reported the fix in PR #7644 2023-08-18 13:45:53 +03:00
Sébastien Loriot eada3ee8ca Merge branch 'master' into 'sloriot/CGAL-using_c++17_stl' 2023-08-14 14:19:25 +02:00
Sébastien Loriot ed71cfdaa0 Merge pull request #7445 from afabri/Mesh_3-doc_fixes-GF
Mesh_3: Improvements of the Documentation
2023-08-14 14:06:16 +02:00
Sebastien Loriot bdbba81ea9
Spelling corrections (#7624)
Spelling corrections `a e...` -> `an e...`
2023-08-14 11:57:58 +02:00
Sebastien Loriot c5cf3d9915
Edge insertion for CMap/GMap (#7409)
_Please use the following template to help us managing pull requests._

## Summary of Changes

Added the function `insert_cell_1_between_two_cells_2()` into
`GenericMap` concept, which allows users to insert an edge between two
different faces allowing to create faces with holes.

## Release Management

* Affected package(s): CMap/GMap
* Feature/Small Feature (if any):
https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Insert_edge_CMap/GMap
* Link to compiled documentation (obligatory for small feature) [*wrong
link name to be changed*](httpssss://wrong_URL_to_be_changed/Manual/Pkg)
* License and copyright ownership:
2023-08-14 11:55:26 +02:00
Sebastien Loriot 2f3588b156
Add `CGAL/version_checker.h` (#7528)
## Summary of Changes

Following discussion #7525 I added the header `version_enforcer.h`

In the general case, it has nothing to check. If the user includes his
own fork of `version_enforcer.h` with a given number of CGAL version,
then the check happens.

## Release Management

* Affected package(s): Installation
2023-08-14 11:50:58 +02:00
Andreas Fabri 9696eca78a
Update Installation/CHANGES.md
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
2023-08-02 17:52:31 +02:00
albert-github 1cce66c343 Spelling corrections
Spelling corrections `a e...` -> `an e...`
2023-07-30 12:59:17 +02:00
Laurent Rineau 1d3456d6b0 Merge branch '5.6.x-branch'
# Conflicts:
#	Installation/include/CGAL/version.h
#	Installation/lib/cmake/CGAL/CGALConfigVersion.cmake
2023-07-28 17:59:20 +02:00
Laurent Rineau dd3b569e7a next release in this branch will be 5.6.1 2023-07-28 17:57:58 +02:00
Laurent Rineau d5919b38e2 annoucements for CGAL-5.6 2023-07-28 17:55:15 +02:00
Andreas Fabri 959443253d Remove deprecated file 2023-07-28 12:41:45 +01:00
Laurent Rineau 4023b226c0 Next release with this branch will be 5.5.4 2023-07-28 13:04:12 +02:00
Laurent Rineau 454ac73b35 prepare CGAL-5.6 final version 2023-07-26 14:15:49 +02:00
Jane Tournois a76926c8f6 replace "bad" / "wrong" / "authorized" to "compatible" / "incompatible" version
after review
2023-07-24 16:36:35 +02:00
Laurent Rineau d6ebf17baa Merge remote-tracking branch 'cgal/5.6.x-branch' 2023-07-20 10:12:26 +02:00
Mael Rouxel-Labbé 225428690f Update the date 2023-07-19 23:14:14 +02:00
Mael Rouxel-Labbé 8136ff2879 Add missing breaking change in 5.6 Tetrahedral_remeshing 2023-07-19 23:13:56 +02:00
Mael c6fd1d0316
Merge branch 'master' into CGAL-Qt6-GF 2023-07-18 10:49:58 +02:00
Laurent Rineau ff2f100d23 ImageInterface.ui moved by PR #7313 2023-07-12 10:41:17 +02:00
Laurent Rineau 2330898f9d
Merge branch 'master' into CGAL-reuse_compliance-lrineau 2023-07-12 10:30:42 +02:00
Laurent Rineau 62438e59d3 deduplicate the LICENSES/ directory
The script `cgal_create_release_with_cmake.cmake` has been modified.
2023-07-06 12:36:33 +02:00
Laurent Rineau 7df8d95d1b remove 0x0c (Page break) 2023-07-05 16:45:12 +02:00
Laurent Rineau f14769935a GPLv2: replace TAB by 8 spaces 2023-07-05 15:34:41 +02:00
Sébastien Loriot b66afab814 Merge remote-tracking branch 'sloriot/CGAL-using_c++17_stl' into HEAD 2023-07-05 11:29:35 +02:00
Laurent Rineau b5b261cfc2 Add support for REUSE
https://reuse.software/

The directories `.reuse/` and `LICENSES/` are for the Git layout.
The same directories in `Installation/` are for the tarball layout.

I have verified that with this patch `v5.5.2` and its release tarball
are compliant with the REUSE specifications.

The shady part is the file `.reuse/DEP5`, kind of equivalent to that
paragraph in `LICENSE.md`:
> A lot of files in the Git repository are not distributed in the source
> tarballs, for examples all the files in the `doc/` and `test/`
> sub-directories of CGAL packages. For all those files, unless they
> have an explicit license notice, the license is the
> Creative Commons CC0 1.0.

We should review the list of files corresponding to the pattern in that
file `.reuse/DEP5`.
2023-07-03 18:45:51 +02:00
Andreas Fabri 0f4f903f60 merge cgal/master 2023-06-24 10:24:15 +01:00
Andreas Fabri 518c32e193 Update change log 2023-06-24 10:21:22 +01:00
Guillaume Damiand 21f945ef99 Update change (insert concerns both cmap and gmap) 2023-06-23 08:48:00 +02:00
Jane Tournois 571536f09c fix version checker
the 3 major/minor/patch are needed to compare integrals

if they are defined, the version check is done and warning or error are displayed
2023-06-22 14:38:23 +02:00
Sébastien Loriot 573de7f29e Merge branch 'master' 2023-06-22 13:38:49 +02:00
Guillaume Damiand c44371aa4e
Merge branch 'master' into CMap-insert-gdamiand 2023-06-22 12:18:23 +02:00
Sébastien Loriot cce3dfd075 Merge pull request #7416 from sloriot/CGAL-toward_6.0
CGAL 6.0 requires c++17
2023-06-22 09:28:15 +02:00
Guillaume Damiand 8fb08a1405 Update changes.md 2023-06-21 15:37:11 +02:00
Sébastien Loriot 76f16d7c38 use std::get_if, get()->value() and remove CGAL::Object usage in Envelope
changes in arrangement based packages
2023-06-20 18:32:13 +02:00
Sébastien Loriot 0ee31a5d4f remove extra parenthesis 2023-06-19 19:17:49 +02:00
Jane Tournois 5a7f0252ac fix error message 2023-06-15 16:27:08 +02:00
Jane Tournois 522183bd00 add version_enforcer.h to ease the use of forked headers in external code 2023-06-15 16:16:51 +02:00
Sébastien Loriot 9cdfe70abb Merge remote-tracking branch 'sloriot/CGAL-toward_6.0' 2023-06-15 11:34:09 +02:00
Sébastien Loriot 9a0bdb5d96 boost::variant ---> std::variant 2023-06-15 10:57:10 +02:00
Sébastien Loriot 604dcdc435 boost::optional => std::optional 2023-06-15 10:57:09 +02:00
Sébastien Loriot 71b4e4f08f boost::shared_ptr => std::shared_ptr 2023-06-15 10:57:01 +02:00
Sébastien Loriot bbc4d08ee0 Merge remote-tracking branch 'cgal/master' into HEAD 2023-06-15 10:47:07 +02:00
Sébastien Loriot 6df9a0d61c check headers also needs c++17 2023-06-15 10:43:53 +02:00
Sébastien Loriot cc1cb02ccd missing 6.0 updates 2023-06-15 10:43:40 +02:00
Sébastien Loriot f5803d5a8b MSVC 2015 is no longer supported 2023-06-15 10:43:16 +02:00
Sébastien Loriot c8a88b9014 remove CGAL_static_assertion* 2023-06-15 10:42:10 +02:00
Sébastien Loriot e54408370b remove CGAL_CXX17 macro
... and no longer used macros
2023-06-15 10:41:56 +02:00
Sébastien Loriot 852b3b664b expand -CGAL_CPP17_INLINE macro 2023-06-15 10:40:54 +02:00
Laurent Rineau 5459870e31 create a new CMake function CGAL_setup_CGAL_flags
That new CMake function will ease the work with the Conan CGAL package.
2023-06-13 14:19:06 +02:00
Laurent Rineau d90d6cb6e2 this branch now targets CGAL-5.6-beta2 2023-06-13 13:37:11 +02:00
Laurent Rineau 12cc83e7d5 prepare the creation of 5.6-beta2 and 6.0-dev 2023-06-13 13:33:51 +02:00
Sébastien Loriot 29b84248f8 missing 6.0 updates
# Conflicts:
#	Documentation/doc/resources/1.8.20/menu_version.js
#	Documentation/doc/resources/1.8.4/menu_version.js
#	Documentation/doc/resources/1.9.3/menu_version.js
2023-06-13 12:50:04 +02:00
Sébastien Loriot 5564cb247f bump CGAL version to 6.0 2023-06-13 11:38:31 +02:00
Laurent Rineau 34d004eff3
Prepare CHANGES.md for 5.6 (#7393)
- [x] Add missing links from last PRs (master doc not yet built)
- [x] Integrate changes from small features yet to be integrated
- [x] Check all pull requests to find what is worth mentioning and has
not been
- [x] Link to news
- [x] Check all links

## Release Management


[Preview](https://github.com/MaelRL/cgal/blob/CGAL-Prepare_CHANGES.md_5.6-GF/Installation/CHANGES.md)

* Affected package(s): `Installation`
* Issue(s) solved (if any): -
* Feature/Small Feature (if any): n/a
* License and copyright ownership: no changes
2023-06-09 17:49:58 +02:00
Laurent Rineau 4cf3095ff5 Merge pull request #7502 from lrineau/Installation-fix_CGALConfig.cmake_for_Conan-GF
fix for Conan 2.0
2023-06-09 16:26:24 +02:00
Laurent Rineau 5f8da0463d Merge pull request #7505 from sloriot/Installation-fix_cmake_warning
Minimum version should be first
2023-06-09 16:26:20 +02:00
Sébastien Loriot d1ddd62192 minimum version should be first 2023-06-09 09:20:03 +02:00
Laurent Rineau 4d7b71bbb7 Update the patch for Conan 2.0 2023-06-08 17:32:47 +02:00
Laurent Rineau 4f95ee4da6 Merge pull request #7498 from sloriot/fix_libpointmatcher_link
Fix link issue with pointmatcher
2023-06-07 17:34:03 +02:00
Laurent Rineau 16425cc053 Merge pull request #7498 from sloriot/fix_libpointmatcher_link
Fix link issue with pointmatcher
2023-06-07 17:33:39 +02:00
Laurent Rineau 1b42d8ca60 fix for Conan 2.0 2023-06-07 15:20:20 +02:00
Mael Rouxel-Labbé b1371131ab Minor rephrasing 2023-06-05 16:39:39 +02:00
Mael Rouxel-Labbé 5d7abd6a4d Add missing links 2023-06-05 16:32:56 +02:00
Mael Rouxel-Labbé 916f3fec5d Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-06-05 15:56:16 +02:00
Sébastien Loriot 933fe5004a link with libnabo 2023-06-05 15:46:50 +02:00
Laurent Rineau c31d3e126f Merge pull request #7456 from lrineau/Installation-upgrade_FindTBB.cmake-GF
Upgrade FindTBB.cmake
2023-06-05 15:10:15 +02:00
Laurent Rineau bce4c8398d Merge pull request #7456 from lrineau/Installation-upgrade_FindTBB.cmake-GF
Upgrade FindTBB.cmake
2023-06-05 14:01:28 +02:00
Mael Rouxel-Labbé 0bb31ee188 Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-06-02 10:21:19 +02:00
Laurent Rineau c02bd3cbd5 Reintroduce a search in NO_MODULE mode 2023-06-01 10:15:58 +02:00
Sebastien Loriot b1b02d64fe
P3M3: Non-cubic domains, fixes, improvements (#7062)
## Summary of Changes

- Add a dummy point generator that is agnostic to the periodic domain's
geometry, allowing P3M3 to handle non-cubic domain.
- Add an example of P3M3 running on polyhedral domains.
- Fix a few issues in SMDS_3's tet soup reading relating to
non-manifoldness + general IO code speed improvements.
- Fix a few issues in P3M3's medit output and always duplicate facets to
reduce the quantity of non-manifoldness occurences.
- Fix an issue with including Mesh_3 headers before P3M3's.
- Fix periodic point projection (for Mesh_3 optimizers) badly computing
the projection direction
- Robustify a handful of P3M3 functions that were using intermediate
constructions rather than the <Point, Offset> API (which uses filtered
predicates and thus yields proper robustness)
- Misc minor code cleaning / modernization

ToDo:
- [x] Check if some medit IO issues are fixed
- [x] Add non-manifoldness flag to read_MEDIT
- [x] Fix value of orthosphere_radius_threshold
- [x] Check calls of insert_dummy_points() (use generic)
- [x] Check doc of P3M3 about cubic domains requirement

Not done:
- [ ] Fix sharp features for periodic polyhedral domains (problems due
to changing weights creating cover change...). Code:
https://gist.github.com/MaelRL/357c52dc04e16a162f13a3c6860a1398; WIP
diff: https://gist.github.com/MaelRL/f98809964acffbacb6d3f42793e2654e

## Release Management

* Affected package(s): `Mesh_3`,  `P3M3`, `P3T3`, `SMDS3`
* Issue(s) solved (if any): Fix #6997, Fix #7214
* Feature/Small Feature (if any): TODO
* License and copyright ownership: no change
2023-05-30 19:13:45 +02:00
Mael Rouxel-Labbé 61e1a778eb Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-05-22 12:22:01 +02:00
Mael Rouxel-Labbé c6f0067621 Minor header fix 2023-05-22 10:19:28 +02:00
Sebastien Loriot 11b92e94f8
Add an alternative of Mpzf using boost cpp_int (#7191)
## TODO:
- [x] branch size
- [x] boost backend should not be the default in 5.6
2023-05-22 09:23:35 +02:00
Sebastien Loriot ca6cccb218
Bso 2 draw efif (#7434)
## Summary of Changes

Exposed required member functions of the GeneralPolygonWithHoles_2
concept, and fixed the drawing of objects the type of which is model of
the concept, i.e., the template General_polygon_with_holes_2.

## Release Management

* Affected package(s): Polygon, Boolean_set_operations_2
* Issue(s) solved (if any): NA
* Feature/Small Feature (if any): [Features/Small Features/Enhancing
General Polygons with
Holes](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Enhancing_General_Polygons_with_Holes)
* Link to compiled documentation
[GeneralPolygonWithHoles_2](https://www.cs.tau.ac.il/~efif/doc_output7/Polygon/classGeneralPolygonWithHoles__2.html)
* License and copyright ownership: TAU
2023-05-22 09:21:59 +02:00
Laurent Rineau 44a7b6a431 Upgrade FindTBB.cmake
Fixes https://github.com/CGAL/cgal/issues/7349
2023-05-19 18:36:24 +02:00
Mael Rouxel-Labbé c902dfafc8 Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-05-12 10:36:02 +02:00
Laurent Rineau 5adff3d3d1 Merge pull request #7405 from janetournois/Mesh_3-min_size-jtournois
Mesh 3 - min size criteria for edges, facets and cells
2023-05-11 17:37:21 +02:00
Laurent Rineau 9bafd13b00 Merge pull request #6721 from efifogel/Aos_2-conics-efif
Resurect The Conic Traits
2023-05-11 16:55:35 +02:00
Laurent Rineau d079559577 Merge pull request #7413 from lrineau/CGAL-fix-Qt5-CMake-GF
Qt5::Svg is now only optional for CGAL_Qt5
2023-05-11 16:55:28 +02:00
Efi Fogel 857f276dea Applied small fixes 2023-05-08 21:43:06 +03:00
Efi Fogel c1bf94e610 Merge branch 'master' into Bso_2-draw-efif 2023-05-08 17:31:26 +03:00
Efi Fogel ff456cb602 Added descriptions of fixes to the Polygon and 2D Regularized Boolean Set Operations packages 2023-05-08 17:26:55 +03:00
Mael Rouxel-Labbé 2b51f0a66e Merge remote-tracking branch 'cgal/master' into CGAL-Prepare_CHANGES.md_5.6-GF 2023-05-05 16:33:33 +02:00
Jane Tournois 73a7d4ff09 Merge remote-tracking branch 'cgal/master' into Mesh_3-min_size-jtournois
# Conflicts:
#	Installation/CHANGES.md
#	Polyhedron/demo/Polyhedron/Plugins/Mesh_3/Mesh_3_plugin.cpp
#	STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
2023-05-05 09:17:33 +02:00
Mael 532b82cb9b
Merge branch 'master' into P3M3-Undocumented_polyhedral_domain_example-GF 2023-05-04 17:28:47 +02:00
Laurent Rineau 628d8ae43d Merge pull request #7307 from janetournois/Mesh_3-sizing_field_with_aabb_tree-GF
Mesh_3 - Document Sizing_field_with_aabb_tree
2023-05-04 17:22:59 +02:00
Laurent Rineau d2bc415a15 Merge pull request #6950 from lrineau/CGAL-allow_Epick_with_float-GF
Simple_precision_epick: an Epick-like kernel with float as FT
2023-05-04 16:37:17 +02:00
Laurent Rineau 1449281db9 Merge pull request #7264 from MaelRL/SLS-Weighted_skeleton-GF
Weighted straight line skeletons
2023-05-04 16:37:12 +02:00
Laurent Rineau 15c98093c0 Merge pull request #7411 from lrineau/CGAL-fix_worktree_with_space-GF
CMake: allow spaces in git working directory
2023-05-04 16:37:01 +02:00
Laurent Rineau eaa2c8cd71 Merge branch '5.4.x-branch' into 5.5.x-branch 2023-05-04 16:35:30 +02:00
Mael Rouxel-Labbé 556dea9d7d Update CHANGES.md 2023-05-03 20:39:51 +02:00
Sébastien Loriot fcd71fa9f3 CGAL now requires C++17 2023-04-28 20:16:28 +02:00
Sébastien Loriot 932ba31013 bump CGAL version to 6.0 2023-04-28 20:08:58 +02:00