39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
|
From abfebc651343909b534ef337aacc7604c99cf0ea Mon Sep 17 00:00:00 2001
|
||
|
|
From: Torsten Paul <Torsten.Paul@gmx.de>
|
||
|
|
Date: Wed, 2 Feb 2022 02:30:59 +0100
|
||
|
|
Subject: [PATCH] CGAL build fix, v5.4 renames projection traits header files
|
||
|
|
and classes.
|
||
|
|
|
||
|
|
---
|
||
|
|
src/cgalutils-tess.cc | 9 +++++----
|
||
|
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/cgalutils-tess.cc b/src/cgalutils-tess.cc
|
||
|
|
index ec1cc1eeb3..37f8cf08b1 100644
|
||
|
|
--- a/src/cgalutils-tess.cc
|
||
|
|
+++ b/src/cgalutils-tess.cc
|
||
|
|
@@ -6,10 +6,12 @@
|
||
|
|
#pragma push_macro("NDEBUG")
|
||
|
|
#undef NDEBUG
|
||
|
|
#include <CGAL/Constrained_Delaunay_triangulation_2.h>
|
||
|
|
-#if CGAL_VERSION_NR >= CGAL_VERSION_NUMBER(4,11,0)
|
||
|
|
- #include <CGAL/Triangulation_2_projection_traits_3.h>
|
||
|
|
+#if CGAL_VERSION_NR < 1050401000
|
||
|
|
+#include <CGAL/Triangulation_2_projection_traits_3.h>
|
||
|
|
+typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
|
||
|
|
#else
|
||
|
|
- #include <CGAL/Triangulation_2_filtered_projection_traits_3.h>
|
||
|
|
+#include <CGAL/Projection_traits_3.h>
|
||
|
|
+typedef CGAL::Filtered_projection_traits_3<K> Projection;
|
||
|
|
#endif
|
||
|
|
#include <CGAL/Triangulation_face_base_with_info_2.h>
|
||
|
|
#pragma pop_macro("NDEBUG")
|
||
|
|
@@ -19,7 +21,6 @@ struct FaceInfo {
|
||
|
|
bool in_domain() { return nesting_level%2 == 1; }
|
||
|
|
};
|
||
|
|
|
||
|
|
-typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
|
||
|
|
typedef CGAL::Triangulation_face_base_with_info_2<FaceInfo, K> Fbb;
|
||
|
|
typedef CGAL::Triangulation_data_structure_2<
|
||
|
|
CGAL::Triangulation_vertex_base_2<Projection>,
|