From 3da093b7563f38a050835abd4b0ff2cedf720c33 Mon Sep 17 00:00:00 2001 From: mosfet80 <10235105+mosfet80@users.noreply.github.com> Date: Mon, 22 Dec 2025 17:44:36 +0100 Subject: [PATCH] Update CGAL.cmake (#10850) * Update CGAL.cmake * Delete deps/CGAL/0001-clang19.patch * Update CGAL.cmake * Update CGAL.cmake --------- Co-authored-by: SoftFever --- deps/CGAL/0001-clang19.patch | 59 ------------------------------------ deps/CGAL/CGAL.cmake | 7 ++--- 2 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 deps/CGAL/0001-clang19.patch diff --git a/deps/CGAL/0001-clang19.patch b/deps/CGAL/0001-clang19.patch deleted file mode 100644 index 92a0293735..0000000000 --- a/deps/CGAL/0001-clang19.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/BGL/include/CGAL/boost/graph/iterator.h 2022-10-07 19:04:41 UTC -+++ b/BGL/include/CGAL/boost/graph/iterator.h -@@ -213,18 +213,7 @@ class Halfedge_around_source_iterator { (public) - {} - - #ifndef DOXYGEN_RUNNING -- // design patter: "safe bool" -- // will be replaced by explicit operator bool with C++11 -- typedef void (Halfedge_around_source_iterator::*bool_type)() const; - -- void this_type_does_not_support_comparisons() const {} -- -- operator bool_type() const -- { -- return (! (this->base() == nullptr)) ? -- &Halfedge_around_source_iterator::this_type_does_not_support_comparisons : 0; -- } -- - bool operator==( const Self& i) const { - CGAL_assertion( anchor == anchor); - return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); -@@ -313,18 +302,7 @@ class Halfedge_around_target_iterator { (public) - {} - - #ifndef DOXYGEN_RUNNING -- // design patter: "safe bool" -- // will be replaced by explicit operator bool with C++11 -- typedef void (Halfedge_around_target_iterator::*bool_type)() const; - -- void this_type_does_not_support_comparisons() const {} -- -- operator bool_type() const -- { -- return (! (this->base() == nullptr)) ? -- &Halfedge_around_target_iterator::this_type_does_not_support_comparisons : 0; -- } -- - bool operator==( const Self& i) const { - CGAL_assertion( anchor == anchor); - return ( g == i.g) && ( pos == i.pos) && ( winding == i.winding); -@@ -411,18 +389,6 @@ class Halfedge_around_face_iterator { (public) - const value_type& operator * ( ) const { return pos; } - pointer operator -> ( ) { return &pos; } - const value_type* operator -> ( ) const { return &pos; } -- -- // design patter: "safe bool" -- // will be replaced by explicit operator bool with C++11 -- typedef void (Halfedge_around_face_iterator::*bool_type)() const; -- -- void this_type_does_not_support_comparisons() const {} -- -- operator bool_type() const -- { -- return (! (this->base() == nullptr)) ? -- &Halfedge_around_face_iterator::this_type_does_not_support_comparisons : 0; -- } - - bool operator==( const Self& i) const { - CGAL_assertion( anchor == anchor); diff --git a/deps/CGAL/CGAL.cmake b/deps/CGAL/CGAL.cmake index 73eee6701b..ec77e0ebae 100644 --- a/deps/CGAL/CGAL.cmake +++ b/deps/CGAL/CGAL.cmake @@ -5,11 +5,10 @@ endif () orcaslicer_add_cmake_project( CGAL # GIT_REPOSITORY https://github.com/CGAL/cgal.git - # GIT_TAG bec70a6d52d8aacb0b3d82a7b4edc3caa899184b # releases/CGAL-5.0 + # GIT_TAG 3654f780ae0c64675cabaef0e5ddaf904c48b4b7 # releases/CGAL-5.6.3 # For whatever reason, this keeps downloading forever (repeats downloads if finished) - URL https://github.com/CGAL/cgal/archive/refs/tags/v5.4.zip - URL_HASH SHA256=d7605e0a5a5ca17da7547592f6f6e4a59430a0bc861948974254d0de43eab4c0 - PATCH_COMMAND git apply ${CGAL_DIRECTORY_FLAG} --verbose --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/0001-clang19.patch + URL https://github.com/CGAL/cgal/releases/download/v5.6.3/CGAL-5.6.3.zip + URL_HASH SHA256=5d577acb4a9918ccb960491482da7a3838f8d363aff47e14d703f19fd84733d4 DEPENDS dep_Boost dep_GMP dep_MPFR )