Merge pull request #4118 from openscad/cgal-version

Update CGAL version numbers (fixes #4104).

CMakeLists.txt

@@ -295,7 +295,7 @@ endif()
 # Reconsider this after CGAL 5.4: https://github.com/CGAL/cgal/pull/6029
 set(ORIGINAL_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
 set(CGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE TRUE)
-find_package(CGAL REQUIRED COMPONENTS Core)
+find_package(CGAL 5.0 REQUIRED COMPONENTS Core)
 message(STATUS "CGAL: ${CGAL_MAJOR_VERSION}.${CGAL_MINOR_VERSION}")
 target_compile_definitions(OpenSCAD PRIVATE ENABLE_CGAL)
 # The macro `CGAL_DEBUG` allows to force CGAL assertions, even if `NDEBUG` is defined,

README.md

@@ -106,7 +106,7 @@ Follow the instructions for the platform you're compiling on below.
 * [cmake (3.5 ->)](https://cmake.org/)
 * [Qt (5.4 ->)](https://qt.io/)
 * [QScintilla2 (2.9 ->)](https://riverbankcomputing.com/software/qscintilla/)
-* [CGAL (5.3 ->)](https://www.cgal.org/)
+* [CGAL (5.4 ->)](https://www.cgal.org/)
  * [GMP (5.x)](https://gmplib.org/)
  * [MPFR (3.x)](https://www.mpfr.org/)
 * [boost (1.56 ->)](https://www.boost.org/)

src/cgal.h

@@ -63,10 +63,6 @@ typedef std::vector<CGAL_Point_3> CGAL_Polygon_3;
 typedef CGAL_Nef_polyhedron2::Explorer::Point CGAL_Point_2e;
 typedef CGAL::Iso_rectangle_2<CGAL::Simple_cartesian<NT2>> CGAL_Iso_rectangle_2e;
 
-#if CGAL_VERSION_NR <= CGAL_VERSION_NUMBER(4, 6, 0)
-#pragma error("CGAL 4.6.0 or above is required.")
-#endif
-
 #define FAST_CSG_KERNEL_IS_LAZY 1
 typedef CGAL::Epeck CGAL_HybridKernel3;
 

src/cgalutils-tess.cc

@@ -4,7 +4,7 @@
 //#include "tess.h"
 
 #include <CGAL/Constrained_Delaunay_triangulation_2.h>
-#if CGAL_VERSION_NR < 1050401000
+#if CGAL_VERSION_NR < CGAL_VERSION_NUMBER(5, 4, 0)
 #include <CGAL/Triangulation_2_projection_traits_3.h>
 typedef CGAL::Triangulation_2_filtered_projection_traits_3<K> Projection;
 #else