Commit Graph

5211 Commits

Author SHA1 Message Date
Sebastien Loriot e871025f36
update our CMake supported versions to ...3.31 (#8727)
## Summary of Changes

Update our CMake supported versions to ...3.31. That will suppress the
warnings about `CMP0167` (from CMake 3.30):

```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```

## Release Management

* Affected package(s): all cmake scripts
* License and copyright ownership: maintenance by GF
2025-02-07 14:03:47 +01:00
Sebastien Loriot 54bfdfe04d
Mesh 3 : initial_points_generator parameter for make_mesh_3 point initialization (#7798)
## Summary of Changes

Added a `initial_points_generator` parameter in make_mesh_3.
With this parameter, we can use a custom functor when initializing the
C3t3 complex.
This functor must follow the
[Initial_points_generator](https://cgal.github.io/7798/v0/Mesh_3/classInitialPointsGenerator.html)
concept.

Tasks:
 - [x] Add `initial_points_generator` parameter in `make_mesh_3`
 - [x] Make an example
 - [x] Write `Construct_initial_points_labeled_image` into a header
- [x] Make `initialize_triangulation_from_labeled_image` use
`Construct_initial_points_labeled_image`
- [x] Change definition of concept `InitialPointsGenerator` to output
`std::tuple<MeshDomain::Point_3, int dimension, MeshDomain::Index>`
(instead of `std::pair<MeshDomain::Point_3, MeshDomain::Index>`)
 - [x] Make it pass checks
 - [x] Document `initial_points_generator` parameter in `make_mesh_3`
 - [x] Document `Construct_initial_points_labeled_image` header
 - [x] Document example
- [x] Delete `initialize_triangulation_from_labeled_image` and
`initialize_triangulation_from_gray_image`
- [x] Make an example of labelled and gray image initialisation with the
parameter or the old custom initialization.
 - [x] Make small feature page
- [x] add `Construct_initial_points_gray_image.h`, similar to
`Construct_initial_points_labeled_image.h`
 - [x] Maybe add a test ?
- [x] announce in `CHANGES.md`, see
https://github.com/CGAL/cgal/pull/7798#issuecomment-2082701644

## Release Management

* Affected package(s): Mesh_3
* Issue(s) solved (if any): 
  * fix #922
  * fix #7469 
  * discussion #7537
  * previous closed PR #7757
* Feature/Small Feature (if any):
[Mesh_3_initial_points_generator_parameter](https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/Mesh_3_initial_points_generator_parameter)
* Link to compiled documentation
[*here*](https://cgal.github.io/7798/v4/Manual/index.html):
*
[make_mesh_3](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Functions.html#gac8599a0c967075f740bf8e2e92c4770e)
has been modified to receive the parameters :
*
[initial_points_generator](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gaf53777b83f1b2f3e7d49275dbab6e46b)
*
[initial_points](https://cgal.github.io/7798/v4/Mesh_3/group__PkgMesh3Parameters.html#gae94f38c6cd23cce45a55608e881a546a)
* The
[InitialPointsGenerator](https://cgal.github.io/7798/v4/Mesh_3/classInitialPointsGenerator.html)
concept that the functor must be a model of.
* A model of this concept :
[Construct_initial_points_labeled_image](https://cgal.github.io/7798/v4/Mesh_3/structCGAL_1_1Construct__initial__points__labeled__image.html)
* License and copyright ownership:
2025-02-05 08:29:06 +01:00
Laurent Rineau e5001d1a50 update our CMake version 3.18...3.31
That will suppress the warnings about `CMP0167` (from CMake 3.30):

```
CMake Warning (dev) at cmake/modules/display-third-party-libs-versions.cmake:37 (find_package):
  Policy CMP0167 is not set: The FindBoost module is removed.  Run "cmake
  --help-policy CMP0167" for policy details.  Use the cmake_policy command to
  set the policy and suppress this warning.
```
2025-02-04 14:32:37 +01:00
Sébastien Loriot b19515e1f8 Merge remote-tracking branch 'cgal/6.0.x-branch' 2025-01-24 08:09:18 +01:00
Sébastien Loriot 7720caa9dc Merge remote-tracking branch 'cgal/5.6.x-branch' into HEAD 2025-01-24 08:08:33 +01:00
Sébastien Loriot d8106aab4b we now use ctest for testing + extra clean up 2025-01-22 11:42:50 +01:00
Efi Fogel a3d5856c2e Added a note regarding fixes of the Landmark point-location strategy so that it can be applied to arrangements on a sphere 2024-12-17 22:40:11 +02:00
Jane Tournois 18a0f69ca2 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Installation/CHANGES.md
2024-12-05 10:17:14 +01:00
Sébastien Loriot 11640a3946 Merge remote-tracking branch 'cgal/6.0.x-branch' in master 2024-12-04 14:13:01 +01:00
Sebastien Loriot ca8898c156
Aos 2 metadata traits decorators efif (#8592)
## Summary of Changes

Introduces two traits decorators, namely `Arr_tracing_traits_2` and
`Arr_counting_traits_2`, which can be used to extract debugging and
informative metadata about the traits in use while the program is being
executed. They have been part of the CGAL distribution for several years
now . (Probably more than a decade.) I gave it a face lift, wrote the
necessary documentation, and added a small example program called
count_and_trace.cpp.

## Release Management

* Affected package(s): 2D Arrangements (Arrangement_on_surface_2)
* Issue(s) solved (if any): NA
* Feature/Small Feature (if any): Aos 2 Metadata Traits Decorators --
**Pre-approval date 2024/11/12**
* Link to compiled documentation (obligatory for small feature)
[Manual](https://www.cs.tau.ac.il/~efif/doc_output9/Arrangement_on_surface_2/)
* License and copyright ownership: TAU
2024-12-04 14:06:12 +01:00
mbarbier 56f57215b6 Fixing ICPC usage with modern cmake and wrappers
Related to conan's conan-io/conan-center-index#25843

replaced 'fp-model strict' by 'fp-model=strict' https://www.intel.com/content/www/us/en/docs/cpp-compiler/developer-guide-reference/2021-8/fp-model-fp.html
for more compatibility with nvcc. as 'fp-model=strict' will be directly
transmited to the compiler while 'fp-model strict' will have 'strict'
being treated as a file input.

Also added a CXX only filter for newer cmake 3.3+
2024-11-27 09:19:23 +00:00
Laurent Rineau da588c9f95 fix a comment in <CGAL/config.h> 2024-11-21 17:02:51 +01:00
Sebastien Loriot dd6adf68b3
use assume from c++23 when possible (#8597) 2024-11-14 07:42:19 +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
Sébastien Loriot db4404f0cc Merge remote-tracking branch 'cgal/6.0.x-branch' 2024-11-08 16:18:00 +01:00
Laurent Rineau 0d76bb4612 remove QT_NO_KEYWORDS from CGAL::CGAL_Basic_viewer 2024-11-08 16:16:28 +01:00
Jane Tournois 25b89cbd83 fix CHANGES.md 2024-11-07 12:55:12 +01:00
Jane Tournois d08d6643e8 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Installation/CHANGES.md
2024-11-07 12:45:40 +01:00
Jane Tournois 4215e18a8b fix CHANGES.md (lost by merge f77f9c6847) 2024-11-07 09:37:52 +01:00
Efi Fogel 67ab177f09 Updated the changes file 2024-11-06 17:33:57 +02:00
Sébastien Loriot a02519677a Merge pull request #8400 from afabri/CGAL-remove_RS-GF
Algebraic_kernel_d: Remove RS
2024-11-05 17:06:19 +01:00
Jane Tournois f3abf598ed Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Mesh_3/examples/Mesh_3/CMakeLists.txt
2024-11-04 12:42:37 +01:00
Sebastien Loriot 1690619625
CGAL: Modernize CMakeLists.txt (#8528)
## Summary of Changes

- Changed `PUBLIC` to `PRIVATE`  in the `target_link_libraries()`
- ~~Link against `Boost::<COMPONENT>`~~ as we do more than just linking
and must use the `CGAL::_.._support`
- Use `target_compile_definitions()` and `add_compile_definitions()`

More to be done.

## Release Management

* Affected package(s): all
* Issue(s) solved (if any): fix one item of  #4815
* License and copyright ownership: unchanged
2024-10-31 10:32:25 +01:00
Jane Tournois f77f9c6847 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Installation/CHANGES.md
2024-10-23 16:35:56 +02:00
Sebastien Loriot 2a572754d5
Add Compiler and OS Info to the TestSuite description table (#8188)
## Summary of Changes
Add Compiler and OS Information to TestSuite Platform Description Table
This PR is linked with those PRs:
   - https://github.com/CGAL/cgal-testsuite-dockerfiles/pull/153
   - https://github.com/CGAL/cgal-testsuite-dockerfiles/pull/154

The version of this Pull Request can be reviewed at [this
link](https://cgal.geometryfactory.com/~nsaillant/testsuite8188/TESTRESULTS/)

## Release Management

* Issue(s) solved (if any): #8167
2024-10-23 11:57:16 +02:00
Laurent Rineau 1709486fba next version will be 5.6.3 2024-10-22 16:36:00 +02:00
Laurent Rineau 8469e92013 this branch will now target 6.0.2 2024-10-22 12:35:12 +02:00
Sébastien Loriot b10841c72b Merge pull request #8532 from afabri/CGAL-duplicateLines-GF
Duplicate Lines
2024-10-21 19:18:02 +02:00
Laurent Rineau 096075ecfc master will now target 6.1 2024-10-21 17:45:41 +02:00
Laurent Rineau fb2a9eac90 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-21 16:32:51 +02:00
Andreas Fabri 0fa0b00b4f Update changes.md 2024-10-21 13:42:16 +01: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
Laurent Rineau 439df7472b leftovers I had not pointed out
I have reviewed all modifications. It should be the last batch.
2024-10-17 10:39:03 +02:00
Laurent Rineau d7dc57f3ce Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-17 00:34:27 +02:00
Laurent Rineau 96cd3e6f09 Merge remote-tracking branch 'cgal/master' into pr/afabri/8528 2024-10-17 00:25:24 +02:00
Laurent Rineau d759e72d8d third batch of modifications 2024-10-17 00:17:59 +02:00
Laurent Rineau 2ca1c4edc1 first batch of modifications during my review
[skip ci] (wait for the second batch of modifications)
2024-10-14 17:42:07 +02:00
Sebastien Loriot 601046fde7
Poisson reconstruction - experiments and speedup using parallel Mesh_3 (#7891)
## Summary of Changes

_Describe what your pull request changes to CGAL (this can be skipped if
it solves an issue already in the tracker or if it is a Feature or Small
Feature submitted to the CGAL Wiki)._

## Release Management

* Affected package(s):
* Issue(s) solved (if any): fix #0000, fix #0000,...
* Feature/Small Feature (if any):
* 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:
2024-10-14 16:19:06 +02:00
Jane Tournois 94b28d5df2 update CHANGES.md 2024-10-14 15:42:15 +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 d0e2be8319 Remove duplicate which was a workaround for cmake 2.6 to see if it is still a problem 2024-10-09 16:48:58 +01:00
Andreas Fabri 42488c7876 free -> freelist; Comment define of _CRTDBG_MAP_ALLOC 2024-10-09 14:44:32 +01:00
Andreas Fabri 527569346e CGAL: Modernize CMakeLists.txt 2024-10-08 17:02:41 +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
Jane Tournois c1f2236ee3 Merge remote-tracking branch 'cgal/master' into Mesh-3-rework-make-mesh-point-initialization-2-aclement
# Conflicts:
#	Installation/CHANGES.md
2024-09-30 14:02:09 +02:00
Jane Tournois 74cd65efcf move to 6.1 2024-09-30 13:49:04 +02:00