diff --git a/CGAL_patches/CGAL/internal/corefinement/intersection_triangle_segment_3.h b/CGAL_patches/CGAL/internal/corefinement/intersection_triangle_segment_3.h index 1a892a9f..1f36a9bf 100644 --- 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 +#if CGAL_VERSION_NR < 1041401000 // version 4.14 #include +#else +#include +#endif namespace CGAL{ namespace internal_IOP{ @@ -153,7 +157,11 @@ do_intersect(typename Polyhedron_types::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 index e38f33ef..ebc8f2ae 100644 --- 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 /**