CGAL: support version 6.0

Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com>
srmainwaring · Dec 30, 2024 · dada5db · dada5db
1 parent 0c575db
commit dada5db
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/gz-waves/src/CGAL_TEST.cc b/gz-waves/src/CGAL_TEST.cc
@@ -317,9 +317,13 @@ TEST(CGAL, SurfaceMeshGridCell) {
   // Plane_intersection;
   // typedef Tree::Primitive_id Primitive_id;
 
+#if CGAL_VERSION_MAJOR >= 6
   typedef std::optional<Tree::Intersection_and_primitive_id<Ray>::Type>
   Ray_intersection;
-
+#else
+  typedef boost::optional<Tree::Intersection_and_primitive_id<Ray>::Type>
+  Ray_intersection;
+#endif
   typedef CGAL::Timer Timer;
 
   Point3 p0(-1.0, -1.0, 1.0);
@@ -416,9 +420,13 @@ TEST(CGAL, SurfaceMeshGrid) {
   // Plane_intersection;
   // typedef Tree::Primitive_id Primitive_id;
 
+#if CGAL_VERSION_MAJOR >= 6
+  typedef std::optional<Tree::Intersection_and_primitive_id<Ray>::Type>
+  Ray_intersection;
+#else
   typedef boost::optional<Tree::Intersection_and_primitive_id<Ray>::Type>
   Ray_intersection;
-
+#endif
   typedef CGAL::Timer Timer;
 
   // Create Grid