From 28d8113ee0dcf64d9d5e13cb68a98de3dc17d5e4 Mon Sep 17 00:00:00 2001 From: Javier Cladellas <82624449+JavierCladellas@users.noreply.github.com> Date: Thu, 10 Sep 2026 15:40:07 +0200 Subject: [PATCH 1/2] Update CGAL version to v6.2.1 --- cmake/importDependenciesHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/importDependenciesHelpers.cmake b/cmake/importDependenciesHelpers.cmake index d3b2add..b619469 100644 --- a/cmake/importDependenciesHelpers.cmake +++ b/cmake/importDependenciesHelpers.cmake @@ -351,7 +351,7 @@ macro(importDependency_CGAL _useSystem _target_dependencies _target_definitions find_package(CGAL REQUIRED COMPONENTS Core) else() FetchContent_Declare( cgal GIT_REPOSITORY https://github.com/CGAL/cgal.git - GIT_TAG v6.2 + GIT_TAG v6.2.1 GIT_SHALLOW ON ) set( WITH_CGAL_Qt5 OFF ) From 72b4713085e01d75f26c19bd8c586a50c63d75c6 Mon Sep 17 00:00:00 2001 From: Javier Cladellas Date: Thu, 10 Sep 2026 15:53:07 +0200 Subject: [PATCH 2/2] reapply and fix cgal patch concerning ccdt3 --- cmake/cgal.patch | 13 +++++++++++++ cmake/importDependenciesHelpers.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 cmake/cgal.patch diff --git a/cmake/cgal.patch b/cmake/cgal.patch new file mode 100644 index 0000000..e0d5ec0 --- /dev/null +++ b/cmake/cgal.patch @@ -0,0 +1,13 @@ +diff --git a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h +index 49bb82f27..2c4d03529 100644 +--- a/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h ++++ b/Constrained_triangulation_3/include/CGAL/Conforming_constrained_Delaunay_triangulation_3.h +@@ -1335,7 +1335,7 @@ protected: + const auto face_id = static_cast(cell->ccdt_3_data().face_constraint_index(facet_index)); + this->face_constraint_misses_subfaces_set(face_id); + auto fh_2 = cell->ccdt_3_data().face_2(this->face_cdt_2(face_id), facet_index); +- fh_2->info().facet_3d = {}; ++ fh_2->info().facet_3d = decltype(fh_2->info().facet_3d){}; + fh_2->info().missing_subface = true; + this->set_facet_constrained({cell, facet_index}, -1, {}); + } diff --git a/cmake/importDependenciesHelpers.cmake b/cmake/importDependenciesHelpers.cmake index b619469..e8b0335 100644 --- a/cmake/importDependenciesHelpers.cmake +++ b/cmake/importDependenciesHelpers.cmake @@ -352,6 +352,7 @@ macro(importDependency_CGAL _useSystem _target_dependencies _target_definitions else() FetchContent_Declare( cgal GIT_REPOSITORY https://github.com/CGAL/cgal.git GIT_TAG v6.2.1 + PATCH_COMMAND git apply "${FEELPP_CORE_CMAKE_DIR}/cgal.patch" UPDATE_DISCONNECTED 1 GIT_SHALLOW ON ) set( WITH_CGAL_Qt5 OFF )