Merge pull request #189 from sloriot/Fix_for_4.14

Update for CGAL 4.14
Oslandia · Jun 3, 2019 · 3bcb3d9 · 3bcb3d9
2 parents 3195451 + 4ab4d25
commit 3bcb3d9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/CGAL_patches/CGAL/internal/corefinement/intersection_triangle_segment_3.h b/CGAL_patches/CGAL/internal/corefinement/intersection_triangle_segment_3.h
@@ -27,7 +27,11 @@
 
 //TODO rename this file when doing proper integration
 #include <CGAL/internal/corefinement/Polyhedron_constness_types.h>
+#if CGAL_VERSION_NR < 1041401000 // version 4.14
 #include <CGAL/internal/Intersections_3/Triangle_3_Segment_3_intersection.h>
+#else
+#include <CGAL/Intersections_3/Segment_3_Triangle_3.h>
+#endif
 namespace CGAL{
 namespace internal_IOP{
 
@@ -153,7 +157,11 @@ do_intersect(typename Polyhedron_types<Polyhedron,Is_const>::Halfedge_handle hh,
       // the segment is coplanar with the triangle's supporting plane
       // we test whether the segment intersects the triangle in the common 
       // supporting plane
+#if CGAL_VERSION_NR < 1041401000 // version 4.14
       if ( ::CGAL::internal::do_intersect_coplanar(a,b,c,p,q,Kernel()) )
+#else
+      if ( ::CGAL::Intersections::internal::do_intersect_coplanar(a,b,c,p,q,Kernel()) )
+#endif
         return Intersection_result(COPLNR,Intersection_info(),true,true);
       return Intersection_result(EMPTY,Intersection_info(),true,true);
 

diff --git a/src/config.h.cmake b/src/config.h.cmake
@@ -20,6 +20,9 @@
 #ifndef _SFCGAL_CONFIG_H_
 #define _SFCGAL_CONFIG_H_
 
+#define CGAL_DO_NOT_USE_BOOST_MP 1
+#define CGAL_DO_NOT_USE_GMPXX 1
+
 #include <SFCGAL/export.h>
 
 /**