Commit Graph

1182 Commits

Author SHA1 Message Date
Sébastien Loriot 3b0d95e0e5 Merge remote-tracking branch 'cgal/6.1.x-branch' into 'cgal/main' 2025-11-06 10:07:15 +01:00
Sébastien Loriot a9b369650a Merge remote-tracking branch 'cgal/6.0.x-branch' into 'cgal/6.1.x-branch' 2025-11-06 10:04:46 +01:00
Sven Oesau 9e36c6744b adding support for Eigen3 5.0.0
moving the Eigen3 version check into CGAL_Eigen3_support.cmake
2025-11-06 10:01:01 +01:00
Sebastien Loriot 7a311ec821
cosmetic improvements of CMake outputs (#9063)
## Summary of Changes

cosmetic improvements of CMake outputs

### set `FOLDER` for sub-directories of CGAL

In VS Code, the CMake project outline is much cleaner if CGAL is
configured with examples and demos:

<img width="416" height="574" alt="Screenshot_20250911_154221"
src="https://github.com/user-attachments/assets/f39f4ea5-317b-4f2d-ba75-e04691674c27"
/>

### set `CMAKE_MESSAGE_INDENT` to indent the outputs in sub-folders

The output messages from sub-directories are indented, now:

```
== Generating build files for examples ==
-- Configuring examples in examples/AABB_tree
-- Configuring examples in examples/Advancing_front_surface_reconstruction
-- Configuring examples in examples/Algebraic_foundations
-- Configuring examples in examples/Algebraic_kernel_d
  NOTICE: This project requires the MPFI library and GMP support, and will not be compiled.
-- Configuring examples in examples/Alpha_shapes_2
-- Configuring examples in examples/Alpha_shapes_3
-- Configuring examples in examples/Alpha_wrap_3
-- Configuring examples in examples/Apollonius_graph_2
-- Configuring examples in examples/Arrangement_on_surface_2
--   Boost include dirs: /usr/include
--   Boost libraries:    
--   Using gcc version 4 or later. Adding -frounding-math
-- Configuring examples in examples/BGL_LCC
-- Configuring examples in examples/BGL_OpenMesh
-- Configuring examples in examples/BGL_arrangement_2
-- Configuring examples in examples/BGL_graphcut
-- Configuring examples in examples/BGL_polyhedron_3
2025-09-22 12:04:29 +02:00
Sébastien Loriot 947c9d0370 Merge pull request #9049 from soesau/CGAL-warnings-GF
Fixing warnings (mostly unused variables)
2025-09-22 12:01:07 +02:00
Sven Oesau 9cefab759d adding dependencies for print_MPFR_version.cpp 2025-09-18 16:33:34 +02:00
Laurent Rineau e0e0dd68cf cosmetic improvements of CMake outputs
- set `FOLDER` for sub-directories of CGAL
- set `CMAKE_MESSAGE_INDENT` to indent the outputs in sub-folders
2025-09-11 15:38:31 +02:00
Sebastien Loriot 47938f6851
fix build of tests/examples/demos for a release (#8989)
Fix issues while building examples/tests/demos for a release (internal
or public)

Fixes #8981
2025-09-05 15:04:17 +02:00
Sébastien Loriot 9c9678c004 do not look for boost system for recent libpointmatcher 2025-08-06 16:29:55 +02:00
Sébastien Loriot edd46b9e29 fix build of tests/examples/demos for a release
it will not work in branch build mode but I'm not sure
this is something we want to support.
2025-07-21 12:16:48 +02:00
Sébastien Loriot 78cfeacf01 Merge pull request #8186 from lrineau/Triangulation_3-CDT_3-lrineau
New package: CGAL 3D conforming constrained Delaunay triangulations
2025-06-26 21:57:17 +02:00
Sébastien Loriot 493fa7cfbd Merge remote-tracking branch 'cgal/6.0.x-branch' into 'cgal/master' 2025-06-26 21:51:30 +02:00
Sven Oesau b5732f43fc Removing deprecated FindSuiteSparse.cmake and FindMETIS.cmake
adding section to ThirdParty documentation for SuiteSparse
2025-06-17 12:58:15 +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
Sébastien Loriot 616ce1b0d7 Merge remote-tracking branch 'cgal/6.0.x-branch' into `cgal/master` 2025-06-04 16:00:21 +02:00
Sven Oesau 920b32fef2 bugfix for libpointmatcher to support latest version 2025-06-02 16:13:00 +02:00
Sébastien Loriot eb368a5625 Merge remote-tracking branch 'cgal/6.0.x-branch' into 'cgal/master' 2025-05-26 12:02:37 +02:00
Sven Oesau d8e17c22c5 Don't generate a CMake error if GMP has not been found 2025-05-15 10:43:34 +02:00
Laurent Rineau 4b029e69bd Merge branch 'CGAL:master' into Triangulation_3-CDT_3-lrineau 2025-05-13 17:14:39 +02:00
Sebastien Loriot 88b04384ba
Basic viewer improvements (#8850)
_Please use the following template to help us managing pull requests._

## Summary of Changes

Some improvements to the basic viewer.

Following the GSOC 2024 project, see PR #8444, extract all the
modifications that concern the current basic_viewer qt (and keep in the
original PR the new basic viewer glfw that could be considered later).

## Changes to the documentation

- in `Graphics_scene`, functions to set/get default colors:
[diff](https://github.com/CGAL/cgal/pull/8850/files#diff-74c5383fef398c7cb3dbfaa8cbc836dbc5a3ad0a7b450442948e7e32d54ced47),
and
[documentation](https://cgal.github.io/8850/doc/Basic_viewer/classCGAL_1_1Graphics__scene.html)
- in `Basic_viewer`, same functions, plus functions for sizes:
[diff](https://github.com/CGAL/cgal/pull/8850/files#diff-cc9bfe7d72d61000248f90b7648c07decb71fd8a400ca54e3ecc8c808b0f70fa),
and
[documentation](https://cgal.github.io/8850/doc/Basic_viewer/classCGAL_1_1Qt_1_1Basic__viewer.html).

## Release Management

* Affected package(s): Basic_viewer
2025-05-12 14:06:35 +02:00
Laurent Rineau 010adccdec fix the mentions of CGAL_USE_BASIC_VIEWER_QT (with the Qt suffix) 2025-05-02 09:22:38 +02:00
albert-github 6153228234 Spelling corrections
Spelling corrections.
2025-04-29 19:11:01 +02:00
Guillaume Damiand 807806b1db add alias target to keep old name CGAL::CGAL_Basic_viewer. 2025-04-25 17:19:05 +02:00
Guillaume Damiand b9efd6983c replace macro CGAL_USE_BASIC_VIEWER by CGAL_USE_BASIC_VIEWER_QT 2025-04-17 17:45:10 +02:00
Jane Tournois c1a3b2dc09 merge cgal/master 2025-04-02 07:26:08 +01:00
Sébastien Loriot 5a83d07e6d Merge remote-tracking branch 'cgal/6.0.x-branch' into master 2025-03-28 18:16:42 +01:00
Sébastien Loriot a3db73dc68 Merge remote-tracking branch 'cgal/5.6.x-branch' into cgal/6.0.x-branch 2025-03-28 18:15:16 +01:00
Laurent Rineau 6b97b34a10 Merge 'cgal/master' into Triangulation_3-CDT_3-lrineau 2025-03-21 18:01:23 +01:00
Laurent Rineau ab56f763cd sort 3rd party libs by name 2025-03-17 14:18:46 +01:00
Sven Oesau 9cb7c57345 removing FindEigen3.cmake
as it is outdated and no longer required
2025-03-10 15:56:40 +01:00
Laurent Rineau 063266f0ac add `CGAL_setup_tl-excepted.cmake` 2025-02-11 18:27:00 +01:00
Laurent Rineau 4e5fed81de fix a bug when `CGAL_BRANCH_BUILD` is falsy (in testsuite tarballs for example) 2025-02-10 15:08:19 +01:00
Laurent Rineau 8eefb7f173 Merge branch 'master' into pr/lrineau/8273 2025-02-07 16:10:52 +01:00
Laurent Rineau 050677f002 add CMake option CGAL_with_benchmarks 2025-02-06 01:21:42 +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
Laurent Rineau e03ba91f54 Boost >= 1.74 is now required 2025-01-13 11:36:05 +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
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
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
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 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 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
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
Laurent Rineau 8afe80430e fix the CMake bug in https://cgal.geometryfactory.com/CGAL/testsuite/results-6.0-I-333.shtml 2024-09-26 13:14:14 +02:00
Laurent Rineau 262fb0bb87 Merge remote-tracking branch 'cgal/master' into List-third-party-libraries-GF 2024-09-20 09:29:21 +02:00
Nicolas Saillant 78af7b96f0 Update OpenMesh version extraction logic in CMake script 2024-09-13 10:11:18 +02:00
Sébastien Loriot 41b096c91a Merge remote-tracking branch 'cgal/5.6.x-branch' 2024-09-11 17:23:50 +02:00