Commit Graph

4963 Commits

Author SHA1 Message Date
Sébastien Loriot 37c792a764 fix qt6 version 2023-12-27 11:56:08 +01:00
Laurent Rineau 9a944e563c Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine
# Conflicts:
#	Installation/CHANGES.md
#	Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt
2023-12-13 15:57:30 +01:00
Laurent Rineau 275c175f15 Merge pull request #5895 from sloriot/PMP-refine_mesh_along_isolevel
add function to refine a mesh along an isocurve
2023-12-11 14:00:49 +01:00
Sébastien Loriot d75e4f2f54 Merge remote-tracking branch 'cgal/master' into PMP-BF_autorefine 2023-12-08 13:26:06 +01:00
Laurent Rineau 23e36487e1 Merge pull request #7816 from afabri/Parameterization-no_opennl-GF
Parameterization: cleanup
2023-11-29 17:23:20 +01:00
Laurent Rineau 95b83b1214 Merge pull request #7845 from puneetmatharu/patch-cgal-dont-override-build-testing
Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject
2023-11-29 17:22:54 +01:00
Laurent Rineau 2cf5576eb8 Merge pull request #7858 from janetournois/Installation-ITK-jtournois
Installation - fix `CGAL_ITK_support`
2023-11-29 17:18:55 +01:00
Laurent Rineau 1740a2d0d7 Merge pull request #7869 from lrineau/Installation-fix_CMake_REGEXP_REPLACE-GF
CMake: fix incorrect use of string(REGEX REPLACE...)
2023-11-29 17:18:53 +01:00
Laurent Rineau fdcc7c7796 Merge remote-tracking branch 'cgal/master' into pr/afabri/7816
# Conflicts:
#	Installation/LICENSE
2023-11-29 16:45:10 +01:00
Laurent Rineau c19cd150cb extra cleanups 2023-11-29 16:34:50 +01:00
Jane Tournois 7fda26f33f add isotropic remeshing with sizing to CHANGES.md 2023-11-27 09:52:49 +01:00
Laurent Rineau eb59cc6105 Merge remote-tracking branch 'cgal/master' into Installation-ITK-jtournois 2023-11-24 10:50:26 +01:00
Laurent Rineau 9262c6a8b6 Re-add CGAL_ITK_support.cmake
That will allow to be compatible with ITK version 4.13 and 5.x.
2023-11-23 17:25:18 +01:00
Laurent Rineau 25ebbab854 Fix incorrect use of string(REGEX REPLACE...) 2023-11-17 15:29:24 +01:00
Sébastien Loriot cfac63f156 Merge remote-tracking branch 'cgal/master' into HEAD 2023-11-16 11:35:35 +01:00
Laurent Rineau ba46b785b1
Merge branch 'master' into Parameterization-no_opennl-GF 2023-11-15 16:33:49 +01:00
Laurent Rineau 69d9025736 Merge pull request #6760 from hoskillua/gsoc2022
GSoC2022 - Interpolated Corrected Curvatures

# Conflicts:
#	Installation/CHANGES.md
2023-11-15 16:00:36 +01:00
Andreas Fabri 59af92c085 more cleanup 2023-11-14 13:41:09 +00:00
Sébastien Loriot 8518e7d0d9 update changes 2023-11-13 18:40:03 +01:00
Jane Tournois 0b73361226 remove CGAL_ITK_support.cmake
and adapt the CMakeLists that were using it
2023-11-13 12:47:39 +01:00
Laurent Rineau a8b8102567 CGAL_ENABLE_TESTING has three definitions
`CGAL_ENABLE_TESTING` is defined three times:
- once in `/CMakeLists.txt` that is the root of the CMake tree for a Git layout
- once in `Installation/CMakeLists.txt` that is the root of the CMake
  for a release tarball,
- and once in `CGAL_add_test.cmake`, for consumers of `CGALConfig.cmake`.

Two changes:
- Add the default value `${BUILD_TESTING}` to all three definitions
- Modify the comment
2023-11-10 13:17:46 +01:00
Puneet Matharu 7944441068 Patch usage of BUILD_TESTING to handle the case that CGAL is a subproject. 2023-11-02 18:09:03 +00:00
Laurent Rineau dea756ed0f fix test/Installation on Windows 2023-11-01 21:29:41 +01:00
Laurent Rineau 51627e3505 Merge remote-tracking branch 'cgal/master' into CGAL-Qt6-GF
# Conflicts:
#	GraphicsView/demo/Bounding_volumes/CMakeLists.txt
2023-11-01 20:59:44 +01:00
Jane Tournois bd9b861cb6 CHANGES.md 2023-10-24 12:32:55 +02:00
Andreas Fabri f1fda7b01e Add to changes.md 2023-10-20 14:59:06 +01:00
Sébastien Loriot a193a1d8fb implement comments from review 2023-10-09 09:08:31 +02:00
Sébastien Loriot 1c91f49cbd update changes 2023-10-09 05:14:38 +02:00
Laurent Rineau a72ccf2089 Fix CMake error on Windows
https://cgal.geometryfactory.com/CGAL/testsuite/CGAL-6.0-Ic-73/Installation/TestReport_Christo_MSVC-2022-Preview-Release.gz
```
CMake Error at cmake/modules/CGAL_SetupGMP.cmake:73 (target_link_libraries):
  The plain signature for target_link_libraries has already been used with
  the target "test_gmp_mpfr_dll".  All uses of target_link_libraries with a
  target must be either all-keyword or all-plain.

  The uses of the plain signature are here:

   * test/Installation/CMakeLists.txt:54 (target_link_libraries)

Call Stack (most recent call first):
  test/Installation/CMakeLists.txt:55 (use_CGAL_GMP_support)
```
2023-09-28 15:04:35 +02:00
Laurent Rineau 029d7a8fba fix test/Installation tests on Windows 2023-09-20 16:50:48 +02:00
Laurent Rineau fe68498e95 CGALConfig.cmake remove the early return()
Otherwise we have a lot of warnings like:
```
CMake Warning at /usr/lib64/cmake/Qt6/QtPublicWalkLibsHelpers.cmake:284 (message):
  When trying to collect dependencies of target
  'Constrained_Delaunay_triangulation_2', the non-existent target 'Qt6::Svg'
  was encountered.  This can likely be fixed by moving the find_package call
  that pulls in 'Qt6::Svg' to the scope of directory
  '/home/lrineau/Git/cgal-testsuite-dockerfiles/testsuite/CGAL-6.0-Ic-66/test/Triangulation_2_Demo'
  or higher.  This warning can be silenced by setting
  QT_SILENCE_MISSING_DEPENDENCY_TARGET_WARNING to ON.
Call Stack (most recent call first):
  /usr/lib64/cmake/Qt6/QtPublicWalkLibsHelpers.cmake:320 (__qt_internal_print_missing_dependency_target_warning)
  /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:609 (__qt_internal_collect_all_target_dependencies)
  /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:709 (_qt_internal_finalize_executable)
  /usr/lib64/cmake/Qt6Core/Qt6CoreMacros.cmake:564:EVAL:1 (qt6_finalize_target)
  test/Triangulation_2_Demo/CMakeLists.txt:DEFERRED
```

The issue was that `find_package(Qt6) ...` is required in any
sub-directory, because imported targets like `Qt6::Svg` are
local to the directory scope.
2023-09-19 15:02:31 +02:00
Laurent Rineau 28632f21fc Merge branch 'master' into CGAL-Qt6-GF
# Conflicts:
#	Installation/CHANGES.md
2023-09-14 17:40:05 +02:00
Laurent Rineau b05e1e9e46 Remove UseCGAL.cmake
and our old CMake macros `use_lib` and `use_component`.
2023-09-14 17:32:55 +02:00
Laurent Rineau 48f37a14dc remove occurrences of Qt5 2023-09-14 17:02:21 +02:00
Laurent Rineau 2f6d51b49b Remove a few occurrences of CGAL_Qt5
... and replace by CGAL_Qt6
2023-09-14 16:33:20 +02:00
Efi Fogel 2be0b164f1 Merge branch 'master' into Aos_2-fixes-efif 2023-09-14 17:17:49 +03:00
Mael Rouxel-Labbé cb68fdf09e Add breaking changes 2023-09-13 15:20:11 +02:00
Sébastien Loriot 9d68f5350e doc + changes 2023-09-04 15:00:06 +02:00
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