diff --git a/AABB_tree/examples/AABB_tree/CMakeLists.txt b/AABB_tree/examples/AABB_tree/CMakeLists.txt index cadd3edc9b8..64bab850dc6 100644 --- a/AABB_tree/examples/AABB_tree/CMakeLists.txt +++ b/AABB_tree/examples/AABB_tree/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(AABB_tree_Examples) find_package(CGAL REQUIRED) diff --git a/AABB_tree/test/AABB_tree/CMakeLists.txt b/AABB_tree/test/AABB_tree/CMakeLists.txt index fa668b5cead..bce39da6f20 100644 --- a/AABB_tree/test/AABB_tree/CMakeLists.txt +++ b/AABB_tree/test/AABB_tree/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(AABB_tree_Tests) find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) # Kept to test the old behaviour. - # create a target per cppfile file( GLOB cppfiles diff --git a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/CMakeLists.txt b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/CMakeLists.txt index edbe9357a0c..812a28b8af5 100644 --- a/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/CMakeLists.txt +++ b/Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Advancing_front_surface_reconstruction_Examples) find_package(CGAL REQUIRED) diff --git a/Advancing_front_surface_reconstruction/test/Advancing_front_surface_reconstruction/CMakeLists.txt b/Advancing_front_surface_reconstruction/test/Advancing_front_surface_reconstruction/CMakeLists.txt index 52efabaf887..0cca532693d 100644 --- a/Advancing_front_surface_reconstruction/test/Advancing_front_surface_reconstruction/CMakeLists.txt +++ b/Advancing_front_surface_reconstruction/test/Advancing_front_surface_reconstruction/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Advancing_front_surface_reconstruction_Tests) find_package(CGAL REQUIRED) diff --git a/Algebraic_foundations/examples/Algebraic_foundations/CMakeLists.txt b/Algebraic_foundations/examples/Algebraic_foundations/CMakeLists.txt index d5a7edb6aba..ccfcf8b64d0 100644 --- a/Algebraic_foundations/examples/Algebraic_foundations/CMakeLists.txt +++ b/Algebraic_foundations/examples/Algebraic_foundations/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Algebraic_foundations_Examples) find_package(CGAL REQUIRED) diff --git a/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt b/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt index 47127a5be57..01ddfe2f0f4 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt +++ b/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Algebraic_foundations_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt index 4e419a83d06..294031a5148 100644 --- a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Algebraic_kernel_d_Examples) find_package(CGAL REQUIRED COMPONENTS Core) @@ -6,7 +6,6 @@ find_package(CGAL REQUIRED COMPONENTS Core) find_package(MPFI QUIET) if(MPFI_FOUND AND NOT CGAL_DISABLE_GMP) - include(${CGAL_USE_FILE}) include(${MPFI_USE_FILE}) include(CGAL_VersionUtils) create_single_source_cgal_program("Compare_1.cpp") diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt index df3997a3065..bab26dad50c 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Algebraic_kernel_d_Tests) # CGAL and its components @@ -28,8 +28,6 @@ endif() # include for local directory include_directories(BEFORE include) -include(${CGAL_USE_FILE}) - # Creating entries for all .cpp/.C files with "main" routine # ########################################################## diff --git a/Algebraic_kernel_for_circles/test/Algebraic_kernel_for_circles/CMakeLists.txt b/Algebraic_kernel_for_circles/test/Algebraic_kernel_for_circles/CMakeLists.txt index 1aeca1fed32..d46b31eb0d4 100644 --- a/Algebraic_kernel_for_circles/test/Algebraic_kernel_for_circles/CMakeLists.txt +++ b/Algebraic_kernel_for_circles/test/Algebraic_kernel_for_circles/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Algebraic_kernel_for_circles_Tests) find_package(CGAL REQUIRED) diff --git a/Algebraic_kernel_for_spheres/test/Algebraic_kernel_for_spheres/CMakeLists.txt b/Algebraic_kernel_for_spheres/test/Algebraic_kernel_for_spheres/CMakeLists.txt index 747b2b0d6e8..002dced9852 100644 --- a/Algebraic_kernel_for_spheres/test/Algebraic_kernel_for_spheres/CMakeLists.txt +++ b/Algebraic_kernel_for_spheres/test/Algebraic_kernel_for_spheres/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Algebraic_kernel_for_spheres_Tests) find_package(CGAL REQUIRED) diff --git a/Alpha_shapes_2/examples/Alpha_shapes_2/CMakeLists.txt b/Alpha_shapes_2/examples/Alpha_shapes_2/CMakeLists.txt index ec6ac74c999..b92b4784569 100644 --- a/Alpha_shapes_2/examples/Alpha_shapes_2/CMakeLists.txt +++ b/Alpha_shapes_2/examples/Alpha_shapes_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Alpha_shapes_2_Examples) find_package(CGAL REQUIRED) diff --git a/Alpha_shapes_2/test/Alpha_shapes_2/CMakeLists.txt b/Alpha_shapes_2/test/Alpha_shapes_2/CMakeLists.txt index b7f1595c03a..e1451864755 100644 --- a/Alpha_shapes_2/test/Alpha_shapes_2/CMakeLists.txt +++ b/Alpha_shapes_2/test/Alpha_shapes_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Alpha_shapes_2_Tests) find_package(CGAL REQUIRED) diff --git a/Alpha_shapes_3/examples/Alpha_shapes_3/CMakeLists.txt b/Alpha_shapes_3/examples/Alpha_shapes_3/CMakeLists.txt index aaad7efb91b..ccf5124b35e 100644 --- a/Alpha_shapes_3/examples/Alpha_shapes_3/CMakeLists.txt +++ b/Alpha_shapes_3/examples/Alpha_shapes_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Alpha_shapes_3_Examples) find_package(CGAL REQUIRED) diff --git a/Alpha_shapes_3/test/Alpha_shapes_3/CMakeLists.txt b/Alpha_shapes_3/test/Alpha_shapes_3/CMakeLists.txt index 07b493e1f6a..87ba6644d33 100644 --- a/Alpha_shapes_3/test/Alpha_shapes_3/CMakeLists.txt +++ b/Alpha_shapes_3/test/Alpha_shapes_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Alpha_shapes_3_Tests) find_package(CGAL REQUIRED) diff --git a/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt b/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt index a72517973a0..d42bcde8a55 100644 --- a/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt +++ b/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Apollonius_graph_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Apollonius_graph_2/test/Apollonius_graph_2/CMakeLists.txt b/Apollonius_graph_2/test/Apollonius_graph_2/CMakeLists.txt index 21fdc4f6f58..2aed43c929e 100644 --- a/Apollonius_graph_2/test/Apollonius_graph_2/CMakeLists.txt +++ b/Apollonius_graph_2/test/Apollonius_graph_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Apollonius_graph_2_Tests) find_package(CGAL REQUIRED) diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt index de65fd58a3c..1b03fece3f2 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt +++ b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Arithmetic_kernel_Tests) find_package(CGAL REQUIRED COMPONENTS Core) @@ -10,7 +10,6 @@ find_package(GMP QUIET) if(GMP_FOUND) - include(${CGAL_USE_FILE}) include(CGAL_VersionUtils) get_dependency_version(GMP) diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt index bc6270c4315..ebbe96fd99b 100644 --- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt +++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Arrangement_on_surface_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h index fd6b82ffd80..dccda40981b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_dcel_base.h @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include @@ -91,9 +91,6 @@ public: /*! Destructor. */ virtual ~Arr_vertex_base() {} - void* for_compact_container() const { return static_cast(p_pt); } - void for_compact_container(void* ptr) { p_pt = static_cast(ptr); } - // Access/modification for pointer squatting void* inc() const { return p_inc; } void set_inc(void * inc) const @@ -186,9 +183,6 @@ public: /*! Destructor. */ virtual ~Arr_halfedge_base() {} - void* for_compact_container() const { return static_cast(p_cv); } - void for_compact_container(void* ptr) { p_cv = static_cast(ptr); } - /*! Check if the curve pointer is nullptr. */ bool has_null_curve() const { return (p_cv == nullptr); } @@ -290,7 +284,7 @@ template class Arr_isolated_vertex; * The default arrangement DCEL vertex class. */ template -class Arr_vertex : public V +class Arr_vertex : public V, public In_place_list_base > { public: @@ -357,7 +351,8 @@ public: * The default arrangement DCEL halfedge class. */ template -class Arr_halfedge : public H +class Arr_halfedge : public H, + public In_place_list_base > { public: typedef H Base; @@ -537,7 +532,7 @@ public: */ template class Arr_face : public F, - public Compact_container_base + public In_place_list_base > { public: typedef F Base; @@ -728,7 +723,7 @@ public: * Representation of an outer CCB. */ template -class Arr_outer_ccb { +class Arr_outer_ccb : public In_place_list_base > { public: typedef Arr_outer_ccb Self; typedef Arr_halfedge Halfedge; @@ -749,9 +744,6 @@ public: p_f(other.p_f), iter_is_not_singular(other.iter_is_not_singular) { if (other.iter_is_not_singular) iter = other.iter; } - void* for_compact_container() const { return static_cast(p_f); } - void for_compact_container(void* ptr) { p_f = static_cast(ptr); } - /*! Obtain a halfedge along the component (const version). */ const Halfedge* halfedge() const { return (*iter); } @@ -796,7 +788,7 @@ public: * Representation of an inner CCB. */ template -class Arr_inner_ccb : public Compact_container_base +class Arr_inner_ccb : public In_place_list_base > { public: typedef Arr_inner_ccb Self; @@ -916,7 +908,8 @@ public: * Representation of an isolated vertex. */ template -class Arr_isolated_vertex { +class Arr_isolated_vertex : +public In_place_list_base > { public: typedef Arr_isolated_vertex Self; typedef Arr_face Face; @@ -936,9 +929,6 @@ public: p_f(other.p_f), iter_is_not_singular(other.iter_is_not_singular) { if (other.iter_is_not_singular) iv_it = other.iv_it; } - void* for_compact_container() const { return static_cast(p_f); } - void for_compact_container(void* ptr) { p_f = static_cast(ptr); } - /*! Obtain the containing face (const version). */ const Face* face() const { return (p_f); } @@ -989,6 +979,13 @@ public: typedef Inner_ccb Hole; protected: + // The vetices, halfedges and faces are stored in three in-place lists. + typedef In_place_list Vertex_list; + typedef In_place_list Halfedge_list; + typedef In_place_list Face_list; + typedef In_place_list Outer_ccb_list; + typedef In_place_list Inner_ccb_list; + typedef In_place_list Iso_vert_list; typedef std::allocator_traits Allocator_traits; typedef typename Allocator_traits::template rebind_alloc Vertex_allocator; @@ -998,13 +995,6 @@ protected: typedef typename Allocator_traits::template rebind_alloc Inner_ccb_allocator; typedef typename Allocator_traits::template rebind_alloc Iso_vert_allocator; - typedef Compact_container Vertex_list; - typedef Compact_container Halfedge_list; - typedef Compact_container Face_list; - typedef Compact_container Outer_ccb_list; - typedef Compact_container Inner_ccb_list; - typedef Compact_container Iso_vert_list; - public: typedef typename Halfedge_list::size_type Size; typedef typename Halfedge_list::size_type size_type; @@ -1021,6 +1011,13 @@ protected: Inner_ccb_list in_ccbs; // The inner CCBs. Iso_vert_list iso_verts; // The isolated vertices. + Vertex_allocator vertex_alloc; // An allocator for vertices. + Halfedge_allocator halfedge_alloc; // An allocator for halfedges. + Face_allocator face_alloc; // An allocator for faces. + Outer_ccb_allocator out_ccb_alloc; // An allocator for outer CCBs. + Inner_ccb_allocator in_ccb_alloc; // An allocator for inner CCBs. + Iso_vert_allocator iso_vert_alloc; // Allocator for isolated vertices. + public: // Definitions of iterators. typedef typename Vertex_list::iterator Vertex_iterator; @@ -1147,7 +1144,10 @@ public: /*! Create a new vertex. */ Vertex* new_vertex() { - return &*vertices.emplace(); + Vertex* v = vertex_alloc.allocate(1); + std::allocator_traits::construct(vertex_alloc,v); + vertices.push_back(*v); + return v; } /*! Create a new pair of opposite halfedges. */ @@ -1167,25 +1167,37 @@ public: /*! Create a new face. */ Face* new_face() { - return &*faces.emplace(); + Face* f = face_alloc.allocate(1); + std::allocator_traits::construct(face_alloc, f); + faces.push_back (*f); + return(f); } /*! Create a new outer CCB. */ Outer_ccb* new_outer_ccb() { - return &*out_ccbs.emplace(); + Outer_ccb* oc = out_ccb_alloc.allocate(1); + std::allocator_traits::construct(out_ccb_alloc, oc); + out_ccbs.push_back(*oc); + return (oc); } /*! Create a new inner CCB. */ Inner_ccb* new_inner_ccb() { - return &*in_ccbs.emplace(); + Inner_ccb* ic = in_ccb_alloc.allocate(1); + std::allocator_traits::construct(in_ccb_alloc, ic); + in_ccbs.push_back(*ic); + return (ic); } /*! Create a new isolated vertex. */ Isolated_vertex* new_isolated_vertex() { - return &*iso_verts.emplace(); + Isolated_vertex* iv = iso_vert_alloc.allocate(1); + std::allocator_traits::construct(iso_vert_alloc, iv); + iso_verts.push_back(*iv); + return (iv); } //@} @@ -1194,7 +1206,9 @@ public: /*! Delete an existing vertex. */ void delete_vertex(Vertex* v) { - vertices.erase (vertices.iterator_to(*v)); + vertices.erase(v); + std::allocator_traits::destroy(vertex_alloc, v); + vertex_alloc.deallocate(v,1); } /*! Delete an existing pair of opposite halfedges. */ @@ -1208,25 +1222,33 @@ public: /*! Delete an existing face. */ void delete_face(Face* f) { - faces.erase (faces.iterator_to(*f)); + faces.erase(f); + std::allocator_traits::destroy(face_alloc, f); + face_alloc.deallocate(f, 1); } /*! Delete an existing outer CCB. */ void delete_outer_ccb(Outer_ccb* oc) { - out_ccbs.erase (out_ccbs.iterator_to(*oc)); + out_ccbs.erase(oc); + std::allocator_traits::destroy(out_ccb_alloc, oc); + out_ccb_alloc.deallocate(oc, 1); } /*! Delete an existing inner CCB. */ void delete_inner_ccb(Inner_ccb* ic) { - in_ccbs.erase (in_ccbs.iterator_to(*ic)); + in_ccbs.erase(ic); + std::allocator_traits::destroy(in_ccb_alloc, ic); + in_ccb_alloc.deallocate(ic, 1); } /*! Delete an existing isolated vertex. */ void delete_isolated_vertex(Isolated_vertex* iv) { - iso_verts.erase (iso_verts.iterator_to(*iv)); + iso_verts.erase(iv); + std::allocator_traits::destroy(iso_vert_alloc, iv); + iso_vert_alloc.deallocate(iv, 1); } /*! Delete all DCEL features. */ @@ -1485,13 +1507,18 @@ protected: /*! Create a new halfedge. */ Halfedge* _new_halfedge() { - return &*halfedges.emplace(); + Halfedge* h = halfedge_alloc.allocate(1); + std::allocator_traits::construct(halfedge_alloc, h); + halfedges.push_back(*h); + return (h); } /*! Delete an existing halfedge. */ void _delete_halfedge(Halfedge* h) { - halfedges.erase (halfedges.iterator_to(*h)); + halfedges.erase(h); + std::allocator_traits::destroy(halfedge_alloc,h); + halfedge_alloc.deallocate(h, 1); } }; diff --git a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h index 761e38b1693..ec70376642b 100644 --- a/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h +++ b/Arrangement_on_surface_2/include/CGAL/Arr_geometry_traits/Conic_x_monotone_arc_2.h @@ -202,7 +202,7 @@ public: // Invalid arc: if (dir_res == EQUAL) return; - this->_info = (Conic_arc_2::IS_VALID | DEGREE_1); + this->_info = (static_cast(Conic_arc_2::IS_VALID) | static_cast(DEGREE_1)); if (dir_res == SMALLER) this->_info = (this->_info | IS_DIRECTED_RIGHT); diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt index 6cb598d9b9a..d4a4b7c58a6 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt @@ -1,14 +1,14 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Arrangement_on_surface_2_Tests) enable_testing() find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) +include (${CGAL_USE_FILE}) # Since CMake-2.8.12: New CMake script, that defines the targets and # the CTest test cases. include(${CMAKE_CURRENT_SOURCE_DIR}/cgal_test.cmake) diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake index 10d293d78a3..898b96445fe 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake @@ -151,6 +151,10 @@ function(cgal_arr_2_add_target exe_name source_file) set(name ${exe_name}_${suffix}) endif() add_executable(${name} ${source_file}) + target_link_libraries(${name} CGAL::CGAL) + if (TARGET CGAL::CGAL_Core) + target_link_libraries(${name} CGAL::CGAL_Core) + endif() add_to_cached_list( CGAL_EXECUTABLE_TARGETS ${name} ) separate_arguments(flags UNIX_COMMAND "${TESTSUITE_CXXFLAGS}") target_compile_options(${name} PRIVATE ${flags}) diff --git a/BGL/examples/BGL_LCC/CMakeLists.txt b/BGL/examples/BGL_LCC/CMakeLists.txt index f8537b3dea2..aee37b2a339 100644 --- a/BGL/examples/BGL_LCC/CMakeLists.txt +++ b/BGL/examples/BGL_LCC/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_LCC_Examples) # CGAL and its components diff --git a/BGL/examples/BGL_OpenMesh/CMakeLists.txt b/BGL/examples/BGL_OpenMesh/CMakeLists.txt index 76b82e91ec4..394e7b5a5cd 100644 --- a/BGL/examples/BGL_OpenMesh/CMakeLists.txt +++ b/BGL/examples/BGL_OpenMesh/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_OpenMesh_Examples) # CGAL and its components diff --git a/BGL/examples/BGL_arrangement_2/CMakeLists.txt b/BGL/examples/BGL_arrangement_2/CMakeLists.txt index 03b163ebf8c..bbe6a89f79e 100644 --- a/BGL/examples/BGL_arrangement_2/CMakeLists.txt +++ b/BGL/examples/BGL_arrangement_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_arrangement_2_Examples) find_package(CGAL REQUIRED) diff --git a/BGL/examples/BGL_graphcut/CMakeLists.txt b/BGL/examples/BGL_graphcut/CMakeLists.txt index 2528bfb6c2f..73a4d9cde92 100644 --- a/BGL/examples/BGL_graphcut/CMakeLists.txt +++ b/BGL/examples/BGL_graphcut/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_graphcut_Examples) diff --git a/BGL/examples/BGL_polyhedron_3/CMakeLists.txt b/BGL/examples/BGL_polyhedron_3/CMakeLists.txt index 5c8898febee..70eb9f541fb 100644 --- a/BGL/examples/BGL_polyhedron_3/CMakeLists.txt +++ b/BGL/examples/BGL_polyhedron_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_polyhedron_3_Examples) # CGAL and its components diff --git a/BGL/examples/BGL_surface_mesh/CMakeLists.txt b/BGL/examples/BGL_surface_mesh/CMakeLists.txt index bd6f52f92fb..8443c583e08 100644 --- a/BGL/examples/BGL_surface_mesh/CMakeLists.txt +++ b/BGL/examples/BGL_surface_mesh/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_surface_mesh_Examples) find_package(CGAL REQUIRED) diff --git a/BGL/examples/BGL_triangulation_2/CMakeLists.txt b/BGL/examples/BGL_triangulation_2/CMakeLists.txt index 41d6af06d96..cde6362f648 100644 --- a/BGL/examples/BGL_triangulation_2/CMakeLists.txt +++ b/BGL/examples/BGL_triangulation_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_triangulation_2_Examples) find_package(CGAL REQUIRED) diff --git a/BGL/include/CGAL/boost/graph/IO/PLY.h b/BGL/include/CGAL/boost/graph/IO/PLY.h index f14ad0173af..6cf64f5dd1f 100644 --- a/BGL/include/CGAL/boost/graph/IO/PLY.h +++ b/BGL/include/CGAL/boost/graph/IO/PLY.h @@ -335,7 +335,7 @@ bool write_PLY(std::ostream& os, typedef typename CGAL::GetInitializedVertexIndexMap::const_type VIMap; typedef typename GetVertexPointMap::const_type Vpm; - typedef typename boost::property_traits::reference Point_3; + typedef typename boost::property_traits::value_type Point_3; typedef CGAL::IO::Color Color; typedef typename internal_np::Lookup_named_param_def< internal_np::vertex_color_map_t, @@ -407,7 +407,7 @@ bool write_PLY(std::ostream& os, for(vertex_descriptor vd : vertices(g)) { - Point_3 p = get(vpm, vd); + const Point_3& p = get(vpm, vd); internal::output_properties(os, &p, make_ply_point_writer (CGAL::Identity_property_map())); if(has_vcolor) { diff --git a/BGL/include/CGAL/boost/graph/named_params_helper.h b/BGL/include/CGAL/boost/graph/named_params_helper.h index ff690075698..0d8ca71e7d6 100644 --- a/BGL/include/CGAL/boost/graph/named_params_helper.h +++ b/BGL/include/CGAL/boost/graph/named_params_helper.h @@ -309,23 +309,26 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits::fa template, - bool has_nested_iterator = internal::Has_nested_type_iterator::value> + bool has_nested_iterator = internal::Has_nested_type_iterator::value, + typename NP_TAG = internal_np::point_t + > class GetPointMap { typedef typename std::iterator_traits::value_type Point; typedef typename CGAL::Identity_property_map DefaultPMap; + typedef typename CGAL::Identity_property_map DefaultConstPMap; public: typedef typename internal_np::Lookup_named_param_def< - internal_np::point_t, + NP_TAG, NamedParameters, DefaultPMap > ::type type; typedef typename internal_np::Lookup_named_param_def< - internal_np::point_t, + NP_TAG, NamedParameters, - DefaultPMap + DefaultConstPMap > ::type const_type; }; @@ -336,7 +339,7 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits::fa struct Dummy_point{}; public: typedef typename CGAL::Identity_property_map type; - typedef typename CGAL::Identity_property_map const_type; + typedef typename CGAL::Identity_property_map const_type; }; namespace Point_set_processing_3 { @@ -375,26 +378,6 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits::fa >::Kernel::FT type; }; - template - class GetQueryPointMap - { - typedef typename std::iterator_traits::value_type Point; - typedef typename CGAL::Identity_property_map DefaultPMap; - - public: - typedef typename internal_np::Lookup_named_param_def< - internal_np::query_point_t, - NamedParameters, - DefaultPMap - > ::type type; - - typedef typename internal_np::Lookup_named_param_def< - internal_np::query_point_t, - NamedParameters, - DefaultPMap - > ::type const_type; - }; - template class GetK { @@ -440,6 +423,7 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits::fa { typedef typename PlaneRange::iterator::value_type Plane; typedef typename CGAL::Identity_property_map DefaultPMap; + typedef typename CGAL::Identity_property_map DefaultConstPMap; public: typedef typename internal_np::Lookup_named_param_def< @@ -451,7 +435,7 @@ CGAL_DEF_GET_INITIALIZED_INDEX_MAP(face, typename boost::graph_traits::fa typedef typename internal_np::Lookup_named_param_def< internal_np::plane_t, NamedParameters, - DefaultPMap + DefaultConstPMap > ::type const_type; }; diff --git a/BGL/test/BGL/CMakeLists.txt b/BGL/test/BGL/CMakeLists.txt index c71f8373cc3..0c1991d5132 100644 --- a/BGL/test/BGL/CMakeLists.txt +++ b/BGL/test/BGL/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script_with_options # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(BGL_Tests) # CGAL and its components diff --git a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h index 5804d250516..9e6e353958c 100644 --- a/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h +++ b/Barycentric_coordinates_2/doc/Barycentric_coordinates_2/Concepts/DiscretizedDomain_2.h @@ -13,8 +13,7 @@ elements, which share common edges and vertices. These finite elements are then used to approximate certain types of generalized barycentric coordinate functions. The domain is bounded by the polygon. -\cgalHasModel -- `Delaunay_domain_2` +\cgalHasModel `Delaunay_domain_2` */ class DiscretizedDomain_2 { diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt index 6f8b05dab72..6bb9d41b493 100644 --- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt @@ -3,12 +3,10 @@ project(Barycentric_coordinates_2_Examples) -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("segment_coordinates.cpp") create_single_source_cgal_program("triangle_coordinates.cpp") diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt index a5339063ae2..3e6d976d47b 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt @@ -3,12 +3,10 @@ project(Barycentric_coordinates_2_Tests) -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("test_almost_degenerate_segment.cpp") create_single_source_cgal_program("test_segment_coordinates.cpp") diff --git a/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt b/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt index d2beda4f638..39ac9518fee 100644 --- a/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt +++ b/Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Boolean_set_operations_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core OPTIONAL_COMPONENTS Qt5) diff --git a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h index f74834d250b..f11ae76a1c6 100644 --- a/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h +++ b/Boolean_set_operations_2/include/CGAL/draw_polygon_set_2.h @@ -78,7 +78,7 @@ void draw(const CGAL::Polygon_set_2& aps2, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"t2_viewer","\0"}; + const char* argv[2]={"t2_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimplePolygonSet2ViewerQt > mainwindow(app.activeWindow(), aps2, title); diff --git a/Boolean_set_operations_2/test/Boolean_set_operations_2/CMakeLists.txt b/Boolean_set_operations_2/test/Boolean_set_operations_2/CMakeLists.txt index 3d42aacd667..287e5ab13ae 100644 --- a/Boolean_set_operations_2/test/Boolean_set_operations_2/CMakeLists.txt +++ b/Boolean_set_operations_2/test/Boolean_set_operations_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Boolean_set_operations_2_Tests) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt b/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt index aa10ccb9b10..3c58a1163e2 100644 --- a/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt +++ b/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Approximate_min_ellipsoid_d_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Min_annulus_d/CMakeLists.txt b/Bounding_volumes/examples/Min_annulus_d/CMakeLists.txt index 775d346b585..2ce191f1bf6 100644 --- a/Bounding_volumes/examples/Min_annulus_d/CMakeLists.txt +++ b/Bounding_volumes/examples/Min_annulus_d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Min_annulus_d_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Min_circle_2/CMakeLists.txt b/Bounding_volumes/examples/Min_circle_2/CMakeLists.txt index 7d3fbdb3759..6b08b983fc3 100644 --- a/Bounding_volumes/examples/Min_circle_2/CMakeLists.txt +++ b/Bounding_volumes/examples/Min_circle_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Min_circle_2_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Min_ellipse_2/CMakeLists.txt b/Bounding_volumes/examples/Min_ellipse_2/CMakeLists.txt index 5be8fbdc6d1..6b61189533e 100644 --- a/Bounding_volumes/examples/Min_ellipse_2/CMakeLists.txt +++ b/Bounding_volumes/examples/Min_ellipse_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Min_ellipse_2_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Min_quadrilateral_2/CMakeLists.txt b/Bounding_volumes/examples/Min_quadrilateral_2/CMakeLists.txt index 77a48f94c54..a3470d71fc1 100644 --- a/Bounding_volumes/examples/Min_quadrilateral_2/CMakeLists.txt +++ b/Bounding_volumes/examples/Min_quadrilateral_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Min_quadrilateral_2_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Min_sphere_d/CMakeLists.txt b/Bounding_volumes/examples/Min_sphere_d/CMakeLists.txt index fd2ef1cdb3f..b5a2425c6a4 100644 --- a/Bounding_volumes/examples/Min_sphere_d/CMakeLists.txt +++ b/Bounding_volumes/examples/Min_sphere_d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Min_sphere_d_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Min_sphere_of_spheres_d/CMakeLists.txt b/Bounding_volumes/examples/Min_sphere_of_spheres_d/CMakeLists.txt index 9a5a341c906..7385c7f6970 100644 --- a/Bounding_volumes/examples/Min_sphere_of_spheres_d/CMakeLists.txt +++ b/Bounding_volumes/examples/Min_sphere_of_spheres_d/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Min_sphere_of_spheres_d_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/examples/Rectangular_p_center_2/CMakeLists.txt b/Bounding_volumes/examples/Rectangular_p_center_2/CMakeLists.txt index 1c5cd426aa9..eb9ec9c2301 100644 --- a/Bounding_volumes/examples/Rectangular_p_center_2/CMakeLists.txt +++ b/Bounding_volumes/examples/Rectangular_p_center_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Rectangular_p_center_2_Examples) find_package(CGAL REQUIRED) diff --git a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt index 8bc2edb3809..0b8b882e104 100644 --- a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt +++ b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Bounding_volumes_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # Use Eigen find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/Box_intersection_d/examples/Box_intersection_d/CMakeLists.txt b/Box_intersection_d/examples/Box_intersection_d/CMakeLists.txt index c48763f51e7..e75703fec12 100644 --- a/Box_intersection_d/examples/Box_intersection_d/CMakeLists.txt +++ b/Box_intersection_d/examples/Box_intersection_d/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Box_intersection_d_Examples) find_package(CGAL REQUIRED) diff --git a/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt b/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt index 43873d55ecd..13e69b04196 100644 --- a/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt +++ b/Box_intersection_d/test/Box_intersection_d/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Box_intersection_d_Tests) find_package(CGAL REQUIRED) diff --git a/CGAL_Core/examples/Core/CMakeLists.txt b/CGAL_Core/examples/Core/CMakeLists.txt index 453c4e98acc..8c625287fe0 100644 --- a/CGAL_Core/examples/Core/CMakeLists.txt +++ b/CGAL_Core/examples/Core/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Core_Examples) # CGAL and its components @@ -25,11 +25,6 @@ if(NOT Boost_FOUND) endif() -# include for local directory - -# include for local package -include(${CGAL_USE_FILE}) - # Creating entries for all .cpp/.C files with "main" routine # ########################################################## diff --git a/CGAL_Core/include/CGAL/CORE/BigFloatRep.h b/CGAL_Core/include/CGAL/CORE/BigFloatRep.h index 25cfd243264..7439ce025a9 100644 --- a/CGAL_Core/include/CGAL/CORE/BigFloatRep.h +++ b/CGAL_Core/include/CGAL/CORE/BigFloatRep.h @@ -423,7 +423,7 @@ inline std::string BigFloatRep::toString(long prec, bool sci) const { else return r.rep; } - return nullptr; + return std::string(); } inline void BigFloatRep::dump() const { diff --git a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt index 339e5de6c13..89234fe441c 100644 --- a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt +++ b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt @@ -1,17 +1,12 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(CGALimageIO_Examples) -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - find_package(CGAL REQUIRED COMPONENTS ImageIO) if(CGAL_ImageIO_FOUND) - include(${CGAL_USE_FILE}) create_single_source_cgal_program("convert_raw_image_to_inr.cpp") create_single_source_cgal_program("test_imageio.cpp") diff --git a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt index 924261289eb..08450190831 100644 --- a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt +++ b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt @@ -1,17 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(CGAL_ImageIO_Tests) -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - find_package(CGAL REQUIRED COMPONENTS ImageIO) -include(${CGAL_USE_FILE}) - if(WITH_CGAL_ImageIO) create_single_source_cgal_program("test_trilinear_interpolation.cpp") else() diff --git a/CGAL_ipelets/examples/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/examples/CGAL_ipelets/CMakeLists.txt index 00c4e6455c3..1594e555093 100644 --- a/CGAL_ipelets/examples/CGAL_ipelets/CMakeLists.txt +++ b/CGAL_ipelets/examples/CGAL_ipelets/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(CGAL_ipelets_Examples) find_package(CGAL REQUIRED) diff --git a/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt b/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt index bab9948be44..5cd45e63326 100644 --- a/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt +++ b/Circular_kernel_2/examples/Circular_kernel_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Circular_kernel_2_Examples) find_package(CGAL REQUIRED) diff --git a/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt b/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt index 1ed29d17602..65a130941c1 100644 --- a/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt +++ b/Circular_kernel_2/test/Circular_kernel_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Circular_kernel_2_Tests) find_package(CGAL REQUIRED) diff --git a/Circular_kernel_3/examples/Circular_kernel_3/CMakeLists.txt b/Circular_kernel_3/examples/Circular_kernel_3/CMakeLists.txt index 79bffe98d4e..e4f2ad00455 100644 --- a/Circular_kernel_3/examples/Circular_kernel_3/CMakeLists.txt +++ b/Circular_kernel_3/examples/Circular_kernel_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Circular_kernel_3_Examples) find_package(CGAL REQUIRED) diff --git a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt index ef9c99de8d0..6d0f114e3f7 100644 --- a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt +++ b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Circular_kernel_3_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - include_directories(BEFORE include) # The following `include_directories` is used in the git layout diff --git a/Circulator/examples/Circulator/CMakeLists.txt b/Circulator/examples/Circulator/CMakeLists.txt index 37abde367b7..13496644eb4 100644 --- a/Circulator/examples/Circulator/CMakeLists.txt +++ b/Circulator/examples/Circulator/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Circulator_Examples) find_package(CGAL REQUIRED) diff --git a/Circulator/test/Circulator/CMakeLists.txt b/Circulator/test/Circulator/CMakeLists.txt index 550e6b81738..fc4a94e0c65 100644 --- a/Circulator/test/Circulator/CMakeLists.txt +++ b/Circulator/test/Circulator/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Circulator_Tests) find_package(CGAL REQUIRED) diff --git a/Classification/examples/Classification/CMakeLists.txt b/Classification/examples/Classification/CMakeLists.txt index df854d3e5de..c6fa3e940bf 100644 --- a/Classification/examples/Classification/CMakeLists.txt +++ b/Classification/examples/Classification/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Classification_Examples) # CGAL and its components diff --git a/Classification/include/CGAL/Classification/Point_set_neighborhood.h b/Classification/include/CGAL/Classification/Point_set_neighborhood.h index bc1b2b64ef4..c204a337454 100644 --- a/Classification/include/CGAL/Classification/Point_set_neighborhood.h +++ b/Classification/include/CGAL/Classification/Point_set_neighborhood.h @@ -73,7 +73,9 @@ class Point_set_neighborhood My_point_property_map (const PointRange *input, PointMap point_map) : input (input), point_map (point_map) { } - friend reference get (const My_point_property_map& ppmap, key_type i) + // we did not put `reference` here on purpose as the recommanded default + // is `Identity_property_map` and not `Identity_property_map` + friend decltype(auto) get (const My_point_property_map& ppmap, key_type i) { return get(ppmap.point_map, *(ppmap.input->begin()+std::size_t(i))); } }; diff --git a/Classification/test/Classification/CMakeLists.txt b/Classification/test/Classification/CMakeLists.txt index aca5ae2041a..b6c87b93680 100644 --- a/Classification/test/Classification/CMakeLists.txt +++ b/Classification/test/Classification/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Classification_Tests) # CGAL and its components diff --git a/Combinatorial_map/examples/Combinatorial_map/CMakeLists.txt b/Combinatorial_map/examples/Combinatorial_map/CMakeLists.txt index fafb3efab29..66ebff73166 100644 --- a/Combinatorial_map/examples/Combinatorial_map/CMakeLists.txt +++ b/Combinatorial_map/examples/Combinatorial_map/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Combinatorial_map_Examples) find_package(CGAL REQUIRED) diff --git a/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt b/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt index f5c802d76c9..9e5a1eb2b0a 100644 --- a/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt +++ b/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Combinatorial_map_Tests) find_package(CGAL REQUIRED) diff --git a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt index fcb8d65e14f..d191ee8a827 100644 --- a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt +++ b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt @@ -1,8 +1,7 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Cone_spanners_2_Examples) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core) -include(${CGAL_USE_FILE}) find_package(LEDA QUIET) if(CGAL_Core_FOUND OR LEDA_FOUND) diff --git a/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt b/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt index 3dc0689cdbb..1ef33200e6e 100644 --- a/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt +++ b/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt @@ -1,13 +1,12 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Cone_spanners_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) if(CGAL_Core_FOUND) - include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Convex_decomposition_3/examples/Convex_decomposition_3/CMakeLists.txt b/Convex_decomposition_3/examples/Convex_decomposition_3/CMakeLists.txt index 5a648b46812..830173a80b4 100644 --- a/Convex_decomposition_3/examples/Convex_decomposition_3/CMakeLists.txt +++ b/Convex_decomposition_3/examples/Convex_decomposition_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_decomposition_3_Examples) find_package(CGAL REQUIRED) diff --git a/Convex_decomposition_3/test/Convex_decomposition_3/CMakeLists.txt b/Convex_decomposition_3/test/Convex_decomposition_3/CMakeLists.txt index 68beeb53e59..77ab2ae6b57 100644 --- a/Convex_decomposition_3/test/Convex_decomposition_3/CMakeLists.txt +++ b/Convex_decomposition_3/test/Convex_decomposition_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_decomposition_3_Tests) find_package(CGAL REQUIRED) diff --git a/Convex_hull_2/examples/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/examples/Convex_hull_2/CMakeLists.txt index be021a67a02..b872c996df4 100644 --- a/Convex_hull_2/examples/Convex_hull_2/CMakeLists.txt +++ b/Convex_hull_2/examples/Convex_hull_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_hull_2_Examples) find_package(CGAL REQUIRED) diff --git a/Convex_hull_2/test/Convex_hull_2/CMakeLists.txt b/Convex_hull_2/test/Convex_hull_2/CMakeLists.txt index 68bdb286d71..a754704716d 100644 --- a/Convex_hull_2/test/Convex_hull_2/CMakeLists.txt +++ b/Convex_hull_2/test/Convex_hull_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_hull_2_Tests) find_package(CGAL REQUIRED) diff --git a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt index 5523293f0da..437b548268d 100644 --- a/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt +++ b/Convex_hull_3/examples/Convex_hull_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_hull_3_Examples) # CGAL and its components diff --git a/Convex_hull_3/test/Convex_hull_3/CMakeLists.txt b/Convex_hull_3/test/Convex_hull_3/CMakeLists.txt index 07f3431027e..d21f79ac2fb 100644 --- a/Convex_hull_3/test/Convex_hull_3/CMakeLists.txt +++ b/Convex_hull_3/test/Convex_hull_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_hull_3_Tests) find_package(CGAL REQUIRED) diff --git a/Convex_hull_d/test/Convex_hull_d/CMakeLists.txt b/Convex_hull_d/test/Convex_hull_d/CMakeLists.txt index 544b9f075a4..b3a7da579aa 100644 --- a/Convex_hull_d/test/Convex_hull_d/CMakeLists.txt +++ b/Convex_hull_d/test/Convex_hull_d/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Convex_hull_d_Tests) find_package(CGAL REQUIRED) diff --git a/Distance_2/test/Distance_2/CMakeLists.txt b/Distance_2/test/Distance_2/CMakeLists.txt index 44459bbd4e7..864d2321d09 100644 --- a/Distance_2/test/Distance_2/CMakeLists.txt +++ b/Distance_2/test/Distance_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Distance_2_Tests) find_package(CGAL REQUIRED) diff --git a/Distance_3/test/Distance_3/CMakeLists.txt b/Distance_3/test/Distance_3/CMakeLists.txt index ab31c1558be..e7557ae3b0d 100644 --- a/Distance_3/test/Distance_3/CMakeLists.txt +++ b/Distance_3/test/Distance_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Distance_3_Tests) find_package(CGAL REQUIRED) diff --git a/Envelope_2/examples/Envelope_2/CMakeLists.txt b/Envelope_2/examples/Envelope_2/CMakeLists.txt index c597ec6d806..af2daa75577 100644 --- a/Envelope_2/examples/Envelope_2/CMakeLists.txt +++ b/Envelope_2/examples/Envelope_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Envelope_2_Examples) find_package(CGAL REQUIRED) diff --git a/Envelope_2/test/Envelope_2/CMakeLists.txt b/Envelope_2/test/Envelope_2/CMakeLists.txt index 8f58051ff19..89b4961c75d 100644 --- a/Envelope_2/test/Envelope_2/CMakeLists.txt +++ b/Envelope_2/test/Envelope_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Envelope_2_Tests) find_package(CGAL REQUIRED) diff --git a/Envelope_3/examples/Envelope_3/CMakeLists.txt b/Envelope_3/examples/Envelope_3/CMakeLists.txt index 0159c22a4a6..d40eb5b9513 100644 --- a/Envelope_3/examples/Envelope_3/CMakeLists.txt +++ b/Envelope_3/examples/Envelope_3/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Envelope_3_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Envelope_3/test/Envelope_3/CMakeLists.txt b/Envelope_3/test/Envelope_3/CMakeLists.txt index 7a3a11e066c..f3b24a95860 100644 --- a/Envelope_3/test/Envelope_3/CMakeLists.txt +++ b/Envelope_3/test/Envelope_3/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Envelope_3_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt b/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt index a1909684cf0..cdbab72950b 100644 --- a/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt +++ b/Filtered_kernel/examples/Filtered_kernel/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Filtered_kernel_Examples) find_package(CGAL REQUIRED) diff --git a/Filtered_kernel/test/Filtered_kernel/CMakeLists.txt b/Filtered_kernel/test/Filtered_kernel/CMakeLists.txt index 163ad7d6805..6219a4306b7 100644 --- a/Filtered_kernel/test/Filtered_kernel/CMakeLists.txt +++ b/Filtered_kernel/test/Filtered_kernel/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Filtered_kernel_Tests) find_package(CGAL REQUIRED) diff --git a/Generalized_map/examples/Generalized_map/CMakeLists.txt b/Generalized_map/examples/Generalized_map/CMakeLists.txt index 39ef76a8e46..5ec7b5f5ba0 100644 --- a/Generalized_map/examples/Generalized_map/CMakeLists.txt +++ b/Generalized_map/examples/Generalized_map/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Generalized_map_Examples) find_package(CGAL REQUIRED) diff --git a/Generalized_map/test/Generalized_map/CMakeLists.txt b/Generalized_map/test/Generalized_map/CMakeLists.txt index c672dd81ccc..fec14337999 100644 --- a/Generalized_map/test/Generalized_map/CMakeLists.txt +++ b/Generalized_map/test/Generalized_map/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Generalized_map_Tests) # CGAL and its components diff --git a/Generator/examples/Generator/CMakeLists.txt b/Generator/examples/Generator/CMakeLists.txt index a83c7791bd4..c46802aa4cc 100644 --- a/Generator/examples/Generator/CMakeLists.txt +++ b/Generator/examples/Generator/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Generator_Examples) find_package(CGAL REQUIRED) diff --git a/Generator/test/Generator/CMakeLists.txt b/Generator/test/Generator/CMakeLists.txt index a8f2dd72eb5..1b37e1626ab 100644 --- a/Generator/test/Generator/CMakeLists.txt +++ b/Generator/test/Generator/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Generator_Tests) find_package(CGAL REQUIRED) diff --git a/Geomview/test/Geomview/CMakeLists.txt b/Geomview/test/Geomview/CMakeLists.txt index 959a7069d41..4f055c0c866 100644 --- a/Geomview/test/Geomview/CMakeLists.txt +++ b/Geomview/test/Geomview/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Geomview_Tests) find_package(CGAL REQUIRED) diff --git a/HalfedgeDS/examples/HalfedgeDS/CMakeLists.txt b/HalfedgeDS/examples/HalfedgeDS/CMakeLists.txt index a406247bef1..c881e2e527f 100644 --- a/HalfedgeDS/examples/HalfedgeDS/CMakeLists.txt +++ b/HalfedgeDS/examples/HalfedgeDS/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(HalfedgeDS_Examples) find_package(CGAL REQUIRED) diff --git a/HalfedgeDS/test/HalfedgeDS/CMakeLists.txt b/HalfedgeDS/test/HalfedgeDS/CMakeLists.txt index 78a121117ca..cc149e445c0 100644 --- a/HalfedgeDS/test/HalfedgeDS/CMakeLists.txt +++ b/HalfedgeDS/test/HalfedgeDS/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(HalfedgeDS_Tests) find_package(CGAL REQUIRED) diff --git a/Hash_map/test/Hash_map/CMakeLists.txt b/Hash_map/test/Hash_map/CMakeLists.txt index b7ae3a4e903..8a9f3acf041 100644 --- a/Hash_map/test/Hash_map/CMakeLists.txt +++ b/Hash_map/test/Hash_map/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Hash_map_Tests) find_package(CGAL REQUIRED) diff --git a/Heat_method_3/doc/Heat_method_3/PackageDescription.txt b/Heat_method_3/doc/Heat_method_3/PackageDescription.txt index 2be7893a49a..f562ab1ce22 100644 --- a/Heat_method_3/doc/Heat_method_3/PackageDescription.txt +++ b/Heat_method_3/doc/Heat_method_3/PackageDescription.txt @@ -9,7 +9,7 @@ /*! \addtogroup PkgHeatMethod -\cgalPkgDescriptionBegin{The Heat Method,PkgHeatMethodSummary} +\cgalPkgDescriptionBegin{The Heat Method,PkgHeatMethod} \cgalPkgPicture{heat-method-small.png} \cgalPkgSummaryBegin diff --git a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt index 075aee59e59..753ab978b21 100644 --- a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt @@ -1,15 +1,12 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Heat_method_3_Examples) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) @@ -39,8 +36,6 @@ include_directories(BEFORE include) # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("heat_method.cpp") target_link_libraries(heat_method PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("heat_method_polyhedron.cpp") diff --git a/Heat_method_3/test/Heat_method_3/CMakeLists.txt b/Heat_method_3/test/Heat_method_3/CMakeLists.txt index 898dd5d0135..510976286f9 100644 --- a/Heat_method_3/test/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/test/Heat_method_3/CMakeLists.txt @@ -1,15 +1,12 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Heat_method_3_Tests) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) @@ -39,8 +36,6 @@ include_directories(BEFORE include) # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("heat_method_concept.cpp") target_link_libraries(heat_method_concept PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("heat_method_surface_mesh_test.cpp") diff --git a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt index 779aaf88da5..982f3b9f4e1 100644 --- a/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/demo/Hyperbolic_triangulation_2/CMakeLists.txt @@ -36,6 +36,9 @@ if(CGAL_Qt5_FOUND else() target_link_libraries ( HDT2 ${LEDA_LIBRARIES}) endif() + + include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) + cgal_add_compilation_test( HDT2 ) else() message( STATUS diff --git a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt index cb32ca80aa3..eecec52f82d 100644 --- a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt @@ -1,14 +1,10 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Hyperbolic_triangulation_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("ht2_example.cpp") create_single_source_cgal_program("ht2_example_color.cpp") diff --git a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt index 3a3d4453526..cf4ba8b909a 100644 --- a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt @@ -1,15 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Hyperbolic_triangulation_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("ht2_test_clear.cpp") create_single_source_cgal_program("ht2_test_locate.cpp") create_single_source_cgal_program("ht2_test_remove.cpp") diff --git a/Inscribed_areas/examples/Inscribed_areas/CMakeLists.txt b/Inscribed_areas/examples/Inscribed_areas/CMakeLists.txt index aa9a12bd2b5..a681dae1ff8 100644 --- a/Inscribed_areas/examples/Inscribed_areas/CMakeLists.txt +++ b/Inscribed_areas/examples/Inscribed_areas/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Inscribed_areas_Examples) find_package(CGAL REQUIRED) diff --git a/Inscribed_areas/test/Inscribed_areas/CMakeLists.txt b/Inscribed_areas/test/Inscribed_areas/CMakeLists.txt index d146b711747..c2fdd5e535d 100644 --- a/Inscribed_areas/test/Inscribed_areas/CMakeLists.txt +++ b/Inscribed_areas/test/Inscribed_areas/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Inscribed_areas_Tests) find_package(CGAL REQUIRED) diff --git a/Installation/CHANGES.md b/Installation/CHANGES.md index 4743fa38564..008fdf1bbce 100644 --- a/Installation/CHANGES.md +++ b/Installation/CHANGES.md @@ -1,87 +1,21 @@ Release History =============== + [Release 5.4](https://github.com/CGAL/cgal/releases/tag/v5.4) ----------- Release date: December 2021 -### General changes -- Added the cmake target `CGAL::CGAL_Basic_viewer` to ease the compilation of programs using - the basic viewer based function `CGAL::draw`. This target will define the macro and link with - `CGAL_Qt5` target when linked with it. ### [General changes](https://doc.cgal.org/5.4/Manual/general_intro.html) -- The kernel providing exact constructions and exact predicates (`Exact_predicates_exact_constructions_kernel`) - has been made thread-safe. See changes in 2D and 3D Linear Geometry Kernel - for more details. -### [Weights](https://doc.cgal.org/5.4/Manual/packages.html#PkgWeights) (new package) +- Added the cmake target `CGAL::CGAL_Basic_viewer` to ease the compilation of programs using + the basic viewer-based function `CGAL::draw()`. This target will define the macro and link with + `CGAL_Qt5` target when linked with it. -- This package provides a simple and unified interface to different types of weights. - In particular, it groups all weights into three category: analytic weights including - all basic weights which can be computed analytically for a query point with respect to its - local neighbors in 2D and 3D; barycentric weights including all weights which can be computed - for a query point with respect to the vertices of a planar polygon; and weighting regions - including all weights which are used to balance other weights. - -### [2D Generalized Barycentric Coordinates](https://doc.cgal.org/5.4/Manual/packages.html#PkgBarycentricCoordinates2) (breaking change, major changes) - -- **Breaking change**: The headers `Segment_coordinates_2.h` and `Triangle_coordinates_2.h` are - renamed to `segment_coordinates_2.h` and `triangle_coordinates_2.h`. -- The classes `Segment_coordinates_2` and `Triangle_coordinates_2` are deprecated. The free functions - `compute_segment_coordinates_2()` and `compute_triangle_coordinates_2()` are deprecated as well. - Instead, the free functions `segment_coordinates_2()` and `triangle_coordinates_2()` must be used. -- The enums `Query_point_location` and `Type_of_algorithm` are deprecated. Instead, the enum - `Computation_policy_2` must be used. -- The clases `Wachspress_2`, `Discrete_harmonic_2`, `Mean_value_2`, and - `Generalized_barycentric_coordinates_2` are deprecated. As consequence, the concept `BarycentricCoordinates_2` is deprecated as well. Instead, the classes `Wachspress_coordinates_2`, - `Discrete_harmonic_coordinates_2`, and `Mean_value_coordinates_2` must be used. -- Added the class `Harmonic_coordinates_2` for computing approximate harmonic coordinates in 2D. - These coordinates satisfy all properties of barycentric coordinates inside any simple polygon. -- Added a new concept `DiscretizedDomain_2` and a model of this concept called `Delaunay_domain_2` - which is based on the [Mesh 2](https://doc.cgal.org/5.4/Manual/packages.html#PkgMesh2) package. - A model of this concept is required for computing `Harmonic_coordinates_2`. -- Added free functions for computing Wachspress, discrete harmonic, and mean value coordinates. -- All free functions and classes are now using ranges and property maps. - -### [2D and 3D Linear Geometry Kernel](https://doc.cgal.org/5.4/Manual/packages.html#PkgKernel23) - -- Added `construct_centroid_2_object()` and `compute_determinant_2_object()` in `Projection_traits_xy_3`, `Projection_traits_xz_3`, - and `Projection_traits_yz_3` classes. - -- Added documentation for the class `Projection_traits_3`, which enables the use of 2D algorithms on the projections of 3D data onto an arbitrary plane. - -- Most operations on `Exact_predicates_exact_constructions_kernel` objects are now thread-safe - if `CGAL::Exact_rational` is `mpq_class` (from `GMPXX`), `boost::multiprecision::mpq_rational` or - `CGAL::Quotient`. The objects are not atomic though, so the usual restrictions - on avoiding race conditions apply. For users who do not use threads, this can be disabled with `CGAL_HAS_NO_THREADS`. - -### [dD Kernel](https://doc.cgal.org/5.4/Manual/packages.html#PkgKernelD) -- Most operations on `Epeck_d` objects are now thread-safe, see 2D and 3D Linear Geometry Kernel for details. - -### [Polygon Mesh Processing](https://doc.cgal.org/5.4/Manual/packages.html#PkgPolygonMeshProcessing) - -- Added the function `CGAL::Polygon_mesh_processing::match_faces()`, which, given two polygon meshes, - identifies their common faces as well as faces present in only either of them. - -- Added the functions: `CGAL::Polygon_mesh_processing::bounded_error_Hausdorff_distance()` that - computes an estimate of the one-sided Hausdorff distance between two triangle meshes which - is bounded by a user-specified error bound; `CGAL::Polygon_mesh_processing::bounded_error_symmetric_Hausdorff_distance()` that computes - an estimate of the symmetric Hausdorff distance bounded by a user-specified error bound; - and `CGAL::Polygon_mesh_processing::is_Hausdorff_distance_larger()` that returns `true` - if the bounded-error Hausdorff distance between two meshes is larger than the user-specified - max distance. - -- Added the functions `CGAL::Polygon_mesh_processing::squared_edge_length()` - and `CGAL::Polygon_mesh_processing::squared_face_area()` which do not perform a `sqrt()` operation. - -- Added more functions in the [visitor of the corefinement based methods](https://doc.cgal.org/5.4/Polygon_mesh_processing/classPMPCorefinementVisitor.html) - to track all vertex creations. - -- Added an option to [`CGAL::Polygon_mesh_processing::self_intersections()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__PMP__intersection__grp.html#gaf19c80ec12cbff7ebe9e69453f1d40b8) to report only a limited number of intersections (`maximum_number()`) - -### [The Heat Method](https://doc.cgal.org/5.4/Manual/packages.html#PkgHeatMethod) - -- **Breaking change**: Added the functor `Compute_squared_length_3` that has an operator `operator(const Vector_3& v)`, which computes the squared length of `v`, to the `HeatMethodTraits_3` concept. +- The kernel providing exact constructions and exact predicates + ([`CGAL::Exact_predicates_exact_constructions_kernel`](https://doc.cgal.org/5.4/Kernel_23/classCGAL_1_1Exact__predicates__exact__constructions__kernel.html)) + is now thread-safe. + See changes in `2D and 3D Linear Geometry Kernel` for more details. ### [Shape Regularization](https://doc.cgal.org/5.4/Manual/packages.html#PkgShapeRegularization) (new package) @@ -90,36 +24,91 @@ Release date: December 2021 user-specified conditions. In addition, it provides a global regularization framework that can be adjusted for the user needs and any type of geometric objects. -### [dD Spatial Searching](https://doc.cgal.org/5.4/Manual/packages.html#PkgSpatialSearchingD) +### [Weights](https://doc.cgal.org/5.4/Manual/packages.html#PkgWeights) (new package) -- The kd-tree has a new print method now that enables to output the tree in the stream in the [Graphviz](https://graphviz.org/) format. +- This package provides a simple and unified interface to different types of weights. + In particular, it groups all weights into three category: analytic weights including + all basic weights which can be computed analytically for a query point with respect to its + local neighbors in 2D and 3D; barycentric weights, including all weights which can be computed + for a query point with respect to the vertices of a planar polygon; and weighting regions, + including all weights which are used to balance other weights. -### [CGAL and Solvers](https://doc.cgal.org/5.4/Manual/packages.html#PkgSolverInterface) +### [2D Generalized Barycentric Coordinates](https://doc.cgal.org/5.4/Manual/packages.html#PkgBarycentricCoordinates2) (major changes) -- Added the [OSQP solver](https://osqp.org/) support. This solver enables to efficiently compute the convex Quadratic Programming (QP) problems arising in the context of several packages. +- **Breaking change**: The headers `Segment_coordinates_2.h` and `Triangle_coordinates_2.h` are + renamed to `segment_coordinates_2.h` and `triangle_coordinates_2.h`. +- The classes [`Segment_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Segment__coordinates__2.html) + and [`Triangle_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Triangle__coordinates__2.html) + are deprecated. The free functions [`compute_segment_coordinates_2()`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Segment__coordinates__2.html#a134d363dccaeecb5621fa608fac76eaf) + and [`compute_triangle_coordinates_2()`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Triangle__coordinates__2.html#a958fee3ad9613d7bfa9d7a976aa3548f) + are deprecated as well. Instead, the free functions [`segment_coordinates_2()`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/group__PkgBarycentricCoordinates2RefFunctions.html#gab856ca68d37f58e6cdf74c8aac6f4245) + and [`triangle_coordinates_2()`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/group__PkgBarycentricCoordinates2RefFunctions.html#gaa378786f8996dbcefe7923ebb711e4dd) + should be used. +- The enums [`Query_point_location`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/namespaceCGAL_1_1Barycentric__coordinates.html#aedeeb072a2024053a016afd15e591331) + and [`Type_of_algorithm`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/namespaceCGAL_1_1Barycentric__coordinates.html#a5e5682512438422f23d6080edc49c05b) + are deprecated. Instead, the enum [`Computation_policy_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/namespaceCGAL_1_1Barycentric__coordinates.html#a478bbcec416216b2274ee4b4e97b0e6c) + should be used. +- The classes [`Wachspress_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Wachspress__2.html), + [`Discrete_harmonic_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Discrete__harmonic__2.html), + [`Mean_value_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Mean__value__2.html), + and [`Generalized_barycentric_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Generalized__barycentric__coordinates__2.html) + are deprecated. As consequence, the concept [`BarycentricCoordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1BarycentricCoordinates__2.html) + is deprecated as well. Instead, the classes [`Wachspress_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Wachspress__coordinates__2.html), + [`Discrete_harmonic_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Discrete__harmonic__coordinates__2.html), + and [`Mean_value_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Mean__value__coordinates__2.html) + should be used. +- Added the class [`Harmonic_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Harmonic__coordinates__2.html) + to compute approximate harmonic coordinates in 2D. + These coordinates satisfy all properties of barycentric coordinates inside any simple polygon. +- Added a new concept [`DiscretizedDomain_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1DiscretizedDomain__2.html) + and a model of this concept called [`Delaunay_domain_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Delaunay__domain__2.html), + which is based on the [Mesh 2](https://doc.cgal.org/5.4/Manual/packages.html#PkgMesh2) package. + A model of this concept is required to use [`Harmonic_coordinates_2`](https://doc.cgal.org/5.4/Barycentric_coordinates_2/classCGAL_1_1Barycentric__coordinates_1_1Harmonic__coordinates__2.html). +- Added free functions to compute Wachspress, discrete harmonic, and mean value coordinates. +- All free functions and classes are now using ranges and property maps. + +### [2D and 3D Linear Geometry Kernel](https://doc.cgal.org/5.4/Manual/packages.html#PkgKernel23) + +- Most operations on [`CGAL::Exact_predicates_exact_constructions_kernel`](https://doc.cgal.org/5.4/Kernel_23/classCGAL_1_1Exact__predicates__exact__constructions__kernel.html) + objects are now thread-safe if [`CGAL::Exact_rational`](https://doc.cgal.org/5.4/Number_types/group__nt__cgal.html#ga0849ff44771b19582218ebdfa5614f64) + is [`mpq_class`](https://doc.cgal.org/5.3/Number_types/classmpq__class.html) (from `GMPXX`), + `boost::multiprecision::mpq_rational` + or [`CGAL::Quotient`](https://doc.cgal.org/5.3/Number_types/classCGAL_1_1MP__Float.html). + The objects are not atomic though, so the usual restrictions on avoiding race conditions apply. + For users who do not use threads, this can be disabled with `CGAL_HAS_NO_THREADS`. + +- Added documentation for the class [`Projection_traits_3`](https://doc.cgal.org/5.4/Kernel_23/classCGAL_1_1Projection__traits__3.html), + which enables the use of 2D algorithms on the projections of 3D data onto an arbitrary plane. + +- Added `construct_centroid_2_object()` and `compute_determinant_2_object()` + in [`Projection_traits_xy_3`](https://doc.cgal.org/5.4/Kernel_23/classCGAL_1_1Projection__traits__xy__3.html), + [`Projection_traits_xz_3`](https://doc.cgal.org/5.4/Kernel_23/classCGAL_1_1Projection__traits__xz__3.html), + and [`Projection_traits_yz_3`](https://doc.cgal.org/5.4/Kernel_23/classCGAL_1_1Projection__traits__yz__3.html) + classes. + +- Added the functor + [`NonZeroCoordinateIndex_3`](https://doc.cgal.org/5.4/Kernel_23/classKernel_1_1NonZeroCoordinateIndex__3.html) + to the concept [`Kernel`](https://doc.cgal.org/5.4/Kernel_23/classKernel.html) with `int operator()(Vector_3)` + which returns the index of any coordinate of the vector different from zero, or `-1`. + +### [dD Kernel](https://doc.cgal.org/5.4/Manual/packages.html#PkgKernelD) + +- Most operations on [`Epeck_d`](https://doc.cgal.org/5.4/Kernel_d/structCGAL_1_1Epeck__d.html) + objects are now thread-safe, see 2D and 3D Linear Geometry Kernel for details. ### [2D Arrangements](https://doc.cgal.org/5.4/Manual/packages.html#PkgArrangementOnSurface2) - - A new hierarchy of traits concepts is introduced. +- **Breaking Change:** The traits function objects `Compare_x_at_limit_2` and `Compare_x_near_limit_2` + are renamed to `Compare_x_on_boundary_2` and `Compare_x_near_boundary_2`, respectively. + +- A [new hierarchy of traits concepts](https://doc.cgal.org/5.4/Arrangement_on_surface_2/group__PkgArrangementOnSurface2Concepts.html) + has been introduced. It captures all the valid combinations of boundary conditions for the 4 boundary sides of the parameter space. The 4 boundaries are Bottom, Top, Left, and Right. Each boundary side can be either contracted, identified, close, open, or oblivious. Not all possible combinations are valid. If one side is identified then the other must be as well. Two adjacent sides cannot be contracted. - - **Breaking Change:** The traits function objects `Compare_x_at_limit_2` and `Compare_x_near_limit_2` are renamed to `Compare_x_on_boundary_2` and `Compare_x_near_boundary_2`, respectively. - - - A new geometry traits , namely, `Arr_geodesic_arc_on_sphere_traits_2`, is introduced. It handles arcs of great circles embedded on the unit sphere. - - -### [Point Set Processing](https://doc.cgal.org/5.4/Manual/packages.html#PkgPointSetProcessing3) - -- Added support for `libpointmatcher::GenericDescriptorOutlierFilter` - that enables to provide a map from a point to a weight associated with this point. - - -### [Shape Detection](https://doc.cgal.org/5.4/Manual/packages.html#PkgShapeDetection) - -- Added new shapes to the Region Growing algorithm on a point set: circles in 2D, spheres in 3D, - and cylinders in 3D. +- A new geometric traits, [`Arr_geodesic_arc_on_sphere_traits_2`](https://doc.cgal.org/5.4/Arrangement_on_surface_2/classCGAL_1_1Arr__geodesic__arc__on__sphere__traits__2.html) + has been introduced. It handles arcs of great circles embedded on the unit sphere. ### [2D Regularized Boolean Set-Operations](https://doc.cgal.org/5.4/Manual/packages.html#PkgBooleanSetOperations2) @@ -133,11 +122,61 @@ Release date: December 2021 and [`oriented_side`](https://doc.cgal.org/5.4/Boolean_set_operations_2/group__boolean__oriented__side.html)) to control whether to use `Arr_polyline_traits_2` as default traits. It is the new default as it provides better performances in general. -### [3D Mesh Generation](https://doc.cgal.org/latest/Manual/packages.html#PkgMesh3) +### [3D Mesh Generation](https://doc.cgal.org/5.4/Manual/packages.html#PkgMesh3) - Added support of weighted images for an improved quality of meshes generated from labeled images, - along with a function `CGAL::Mesh_3::generate_label_weights()` to generate the weights. + along with a function [`CGAL::Mesh_3::generate_label_weights()`](https://doc.cgal.org/5.4/Mesh_3/namespaceCGAL_1_1Mesh__3.html#ae5914bf77180ff8948c08046154ee727) + to generate the weights. +### [dD Spatial Searching](https://doc.cgal.org/5.4/Manual/packages.html#PkgSpatialSearchingD) + +- The kd-tree has a new print method now that enables to output the tree in the stream in the [Graphviz](https://graphviz.org/) format. + +### [Polygon Mesh Processing](https://doc.cgal.org/5.4/Manual/packages.html#PkgPolygonMeshProcessing) + +- Added the function [`CGAL::Polygon_mesh_processing::match_faces()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__measure__grp.html#ga10f7cd81645bafe936ac5eb4e58e67ef), + which, given two polygon meshes, identifies their common faces as well as faces present in only either of them. + +- Added the functions: [`CGAL::Polygon_mesh_processing::bounded_error_Hausdorff_distance()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__PMP__distance__grp.html#ga6d4ecea831c33ac10eec42b5021fc183) + that computes an estimate of the one-sided Hausdorff distance between two triangle meshes which + is bounded by a user-specified error bound; [`CGAL::Polygon_mesh_processing::bounded_error_symmetric_Hausdorff_distance()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__PMP__distance__grp.html#ga9a7a682b5d9523135c8502e72117dffd) + that computes an estimate of the symmetric Hausdorff distance bounded by a user-specified error bound; + and [`CGAL::Polygon_mesh_processing::is_Hausdorff_distance_larger()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__PMP__distance__grp.html#gab19e751107025a443e86baa9763aebf3) + that returns `true` if the bounded-error Hausdorff distance between two meshes is larger than the user-specified + max distance. + +- Added the functions [`CGAL::Polygon_mesh_processing::squared_edge_length()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__measure__grp.html#ga30fa03722cd7aa599f6dcb115f54fec5) + and [`CGAL::Polygon_mesh_processing::squared_face_area()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__measure__grp.html#ga6eda3738815fd678df225f79ccfc3e03), + which, compared to [`CGAL::Polygon_mesh_processing::edge_length()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__measure__grp.html#gae1674775d9fecada7f25710f425cff3a) + and [`CGAL::Polygon_mesh_processing::face_area()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__measure__grp.html#ga6a1d7a825c09490b1e6613295343482b), + enable avoiding square-root operations. + +- Added more functions in the [visitor of the corefinement based methods](https://doc.cgal.org/5.4/Polygon_mesh_processing/classPMPCorefinementVisitor.html) + to track all vertex creations. + +- Added an option to [`CGAL::Polygon_mesh_processing::self_intersections()`](https://doc.cgal.org/5.4/Polygon_mesh_processing/group__PMP__intersection__grp.html#gaf19c80ec12cbff7ebe9e69453f1d40b8) + to report only a limited number of intersections (`maximum_number()`). + +### [The Heat Method](https://doc.cgal.org/5.4/Manual/packages.html#PkgHeatMethod) + +- **Breaking change**: Added the functor `Compute_squared_length_3` providing `operator(const Vector_3& v)`, + which computes the squared length of `v`, to the [`HeatMethodTraits_3`](https://doc.cgal.org/5.4/Heat_method_3/classHeatMethodTraits__3.html) + concept. + +### [Point Set Processing](https://doc.cgal.org/5.4/Manual/packages.html#PkgPointSetProcessing3) + +- Added support for [`libpointmatcher::GenericDescriptorOutlierFilter`](https://github.com/ethz-asl/libpointmatcher) + that enables providing a map from a point to a weight associated with this point. + +### [Shape Detection](https://doc.cgal.org/5.4/Manual/packages.html#PkgShapeDetection) + +- Added new shapes to the Region Growing algorithm on a point set: circles in 2D, spheres in 3D, + and cylinders in 3D. + +### [CGAL and Solvers](https://doc.cgal.org/5.4/Manual/packages.html#PkgSolverInterface) + +- Added support for the [OSQP solver](https://osqp.org/). This solver enables to efficiently compute + the convex Quadratic Programming (QP) problems arising in the context of several packages. [Release 5.3](https://github.com/CGAL/cgal/releases/tag/v5.3) ----------- @@ -148,10 +187,14 @@ Release date: July 2021 - The support for the compiled version of CGAL is dropped. Only the header-only version is supported. -- On Windows, the type used for `Exact_rational`, in `Epick` and indirectly (through `Lazy_exact_nt`) +- On Windows, the type used for [`CGAL::Exact_rational`](https://doc.cgal.org/5.3/Number_types/group__nt__cgal.html#ga0849ff44771b19582218ebdfa5614f64), + in `Epick` and indirectly (through [`Lazy_exact_nt`](https://doc.cgal.org/5.3/Number_types/classCGAL_1_1Lazy__exact__nt.html)) `Epeck` may now be `boost::multiprecision::mpq_rational`, as has been the case on other platforms for several releases. This depends on various options and is added to a list that includes - `mpq_class`, `CGAL::Gmpq`, `leda_rational` and `CGAL::Quotient`. + [`mpq_class`](https://doc.cgal.org/5.3/Number_types/classmpq__class.html), + [`CGAL::Gmpq`](https://doc.cgal.org/5.3/Number_types/classCGAL_1_1Gmpq.html), + [`leda_rational`](https://doc.cgal.org/5.3/Number_types/classleda__rational.html) + and [`CGAL::Quotient`](https://doc.cgal.org/5.3/Number_types/classCGAL_1_1MP__Float.html). ### [Quadtrees, Octrees, and Orthtrees](https://doc.cgal.org/5.3/Manual/packages.html#PkgOrthtree) (new package) @@ -664,7 +707,7 @@ Release date: November 2019 `CGAL::Sphere_3`, `CGAL::Vector_2`, `CGAL::Vector_3`, `CGAL::Weighted_point_2` and `CGAL::Weighted_point_3`. -### [Polygon Mesh Processing](https://doc.cgal.org/latest/Manual/packages.html#PkgPolygonMeshProcessing) +### [Polygon Mesh Processing](https://doc.cgal.org/5.0/Manual/packages.html#PkgPolygonMeshProcessing) - Introduced a [wide range of new functions](https://doc.cgal.org/5.0/Polygon_mesh_processing/index.html#title36) related to location of queries on a triangle mesh, such as [`CGAL::Polygon_mesh_processing::locate(Point, Mesh)`](https://doc.cgal.org/5.0/Polygon_mesh_processing/group__PMP__locate__grp.html#gada09bd8740ba69ead9deca597d53cf15). @@ -695,7 +738,7 @@ Release date: November 2019 - The [PLY IO functions](https://doc.cgal.org/5.0/Point_set_3/group__PkgPointSet3IO.html) now take an additional optional parameter to read/write comments from/in the PLY header. -### [Point Set Processing](https://doc.cgal.org/latest/Manual/packages.html#PkgPointSetProcessing3) +### [Point Set Processing](https://doc.cgal.org/5.0/Manual/packages.html#PkgPointSetProcessing3) - **Breaking change**: the API using iterators and overloads for optional parameters (deprecated since CGAL 4.12) has been removed. The current (and now only) API uses ranges and Named Parameters. - Added the possibility to use the named parameter @@ -724,7 +767,7 @@ Release date: November 2019 [`CGAL::Triangulation_data_structure_2`](https://doc.cgal.org/5.0/TDS_2/classCGAL_1_1Triangulation__data__structure__2.html)). - **Breaking change**: The `insert()` function of - [`CGAL::Triangulation_2`](https://doc.cgal.org/latest/Triangulation_2/classCGAL_1_1Triangulation__2.html) + [`CGAL::Triangulation_2`](https://doc.cgal.org/5.0/Triangulation_2/classCGAL_1_1Triangulation__2.html) which takes a range of points as argument is now guaranteed to insert the points following the order of `InputIterator`. Note that this change only affects the base class `Triangulation_2` diff --git a/Installation/include/CGAL/Installation/internal/enable_third_party_libraries.h b/Installation/include/CGAL/Installation/internal/enable_third_party_libraries.h index 9375f7229b1..1e4f7bb3ca0 100644 --- a/Installation/include/CGAL/Installation/internal/enable_third_party_libraries.h +++ b/Installation/include/CGAL/Installation/internal/enable_third_party_libraries.h @@ -27,11 +27,11 @@ #if defined(__has_include) # if CGAL_USE_GMP && ! __has_include() -# warning " cannot be found. Less efficient number types will be used instead. Define CGAL_NO_GMP=1 if that is on purpose." +# pragma CGAL_WARNING( cannot be found. Less efficient number types will be used instead. Define CGAL_NO_GMP=1 if that is on purpose.) # undef CGAL_USE_GMP # undef CGAL_USE_MPFR # elif CGAL_USE_MPFR && ! __has_include() -# warning " cannot be found and the GMP support in CGAL requires it. Less efficient number types will be used instead. Define CGAL_NO_GMP=1 if that is on purpose." +# pragma CGAL_WARNING( cannot be found and the GMP support in CGAL requires it. Less efficient number types will be used instead. Define CGAL_NO_GMP=1 if that is on purpose.) # undef CGAL_USE_GMP # undef CGAL_USE_MPFR # endif // CGAL_USE_MPFR and no diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt index c8df586454b..cd2d5457ada 100644 --- a/Installation/test/Installation/CMakeLists.txt +++ b/Installation/test/Installation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.12...3.20) +cmake_minimum_required(VERSION 3.12...3.22) project( Installation_Tests ) diff --git a/Interpolation/examples/Interpolation/CMakeLists.txt b/Interpolation/examples/Interpolation/CMakeLists.txt index 70201bebab7..1aefd0d4d39 100644 --- a/Interpolation/examples/Interpolation/CMakeLists.txt +++ b/Interpolation/examples/Interpolation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Interpolation_Examples) find_package(CGAL REQUIRED) diff --git a/Interpolation/test/Interpolation/CMakeLists.txt b/Interpolation/test/Interpolation/CMakeLists.txt index 802d6d76edf..f6dc41208b6 100644 --- a/Interpolation/test/Interpolation/CMakeLists.txt +++ b/Interpolation/test/Interpolation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Interpolation_Tests) find_package(CGAL REQUIRED) diff --git a/Intersections_2/test/Intersections_2/CMakeLists.txt b/Intersections_2/test/Intersections_2/CMakeLists.txt index be32dd203a8..badece286ed 100644 --- a/Intersections_2/test/Intersections_2/CMakeLists.txt +++ b/Intersections_2/test/Intersections_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Intersections_2_Tests) find_package(CGAL REQUIRED) diff --git a/Intersections_3/test/Intersections_3/CMakeLists.txt b/Intersections_3/test/Intersections_3/CMakeLists.txt index c032a10e2b3..d59dd5f617c 100644 --- a/Intersections_3/test/Intersections_3/CMakeLists.txt +++ b/Intersections_3/test/Intersections_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Intersections_3_Tests) find_package(CGAL REQUIRED) diff --git a/Interval_skip_list/examples/Interval_skip_list/CMakeLists.txt b/Interval_skip_list/examples/Interval_skip_list/CMakeLists.txt index 9250f4f9979..5c605959610 100644 --- a/Interval_skip_list/examples/Interval_skip_list/CMakeLists.txt +++ b/Interval_skip_list/examples/Interval_skip_list/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Interval_skip_list_Examples) find_package(CGAL REQUIRED) diff --git a/Interval_skip_list/test/Interval_skip_list/CMakeLists.txt b/Interval_skip_list/test/Interval_skip_list/CMakeLists.txt index facb8f3c452..453c4c4d671 100644 --- a/Interval_skip_list/test/Interval_skip_list/CMakeLists.txt +++ b/Interval_skip_list/test/Interval_skip_list/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Interval_skip_list_Tests) find_package(CGAL REQUIRED) diff --git a/Interval_support/test/Interval_support/CMakeLists.txt b/Interval_support/test/Interval_support/CMakeLists.txt index 8d64c1370fb..9efd38e5c96 100644 --- a/Interval_support/test/Interval_support/CMakeLists.txt +++ b/Interval_support/test/Interval_support/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Interval_support_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt index f91f37a4c94..693359255cb 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Jet_fitting_3_Examples) find_package(CGAL REQUIRED) diff --git a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt index cd4953bf2ac..2742885ef4a 100644 --- a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Jet_fitting_3_Tests) find_package(CGAL REQUIRED) diff --git a/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h b/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h index 6e62d132fff..566d7643bcd 100644 --- a/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h +++ b/Kernel_23/doc/Kernel_23/Concepts/FunctionObjectConcepts.h @@ -9130,6 +9130,33 @@ public: }; /* end Kernel::LessZ_3 */ + + +/*! + \ingroup PkgKernel23ConceptsFunctionObjects + \cgalConcept + + \cgalRefines `AdaptableFunctor` (with one arguments) +*/ +class NonZeroCoordinateIndex_3 +{ +public: + + /// \name Operations + /// A model of this concept must provide: + /// @{ + + /*! + returns any of `0`, `1`, or `2` if the corresponding coordinate of the vector `v` is not + equal to zero, and `-1` if `v` is the null vector. + */ + int operator()(const Kernel::Vector_3& v); + + /// @} + +}; + + /*! \ingroup PkgKernel23ConceptsFunctionObjects \cgalConcept diff --git a/Kernel_23/doc/Kernel_23/Concepts/Kernel.h b/Kernel_23/doc/Kernel_23/Concepts/Kernel.h index 22efddcdf89..8322937965d 100644 --- a/Kernel_23/doc/Kernel_23/Concepts/Kernel.h +++ b/Kernel_23/doc/Kernel_23/Concepts/Kernel.h @@ -1563,6 +1563,11 @@ public: */ typedef unspecified_type Has_on_negative_side_3; + /*! + a model of `Kernel::NonZeroCoordinateIndex_3` + */ + typedef unspecified_type Non_zero_coordinate_index_3; + /*! a model of `Kernel::OrientedSide_3` */ diff --git a/Kernel_23/doc/Kernel_23/PackageDescription.txt b/Kernel_23/doc/Kernel_23/PackageDescription.txt index 873c5e089a1..7063daeded7 100644 --- a/Kernel_23/doc/Kernel_23/PackageDescription.txt +++ b/Kernel_23/doc/Kernel_23/PackageDescription.txt @@ -489,6 +489,7 @@ - `Kernel::LessY_2` - `Kernel::LessY_3` - `Kernel::LessZ_3` +- `Kernel::NonZeroCoordinateIndex_3` - `Kernel::Orientation_2` - `Kernel::Orientation_3` - `Kernel::OrientedSide_2` diff --git a/Kernel_23/examples/Kernel_23/CMakeLists.txt b/Kernel_23/examples/Kernel_23/CMakeLists.txt index d48ecbe456a..466b470edab 100644 --- a/Kernel_23/examples/Kernel_23/CMakeLists.txt +++ b/Kernel_23/examples/Kernel_23/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Kernel_23_Examples) find_package(CGAL REQUIRED) diff --git a/Kernel_23/include/CGAL/Kernel/function_objects.h b/Kernel_23/include/CGAL/Kernel/function_objects.h index c3a7337aefb..b70bab2baa1 100644 --- a/Kernel_23/include/CGAL/Kernel/function_objects.h +++ b/Kernel_23/include/CGAL/Kernel/function_objects.h @@ -40,7 +40,7 @@ namespace CommonKernelFunctors { template - class Non_zero_dimension_3 + class Non_zero_coordinate_index_3 { typedef typename K::Vector_3 Vector_3; @@ -49,19 +49,19 @@ namespace CommonKernelFunctors { result_type operator()(const Vector_3& vec) const { - if(certainly_not(is_zero(vec.x()))){ + if(certainly_not(is_zero(vec.hx()))){ return 0; - } else if(certainly_not(is_zero(vec.y()))){ + } else if(certainly_not(is_zero(vec.hy()))){ return 1; - }else if(certainly_not(is_zero(vec.z()))){ + }else if(certainly_not(is_zero(vec.hz()))){ return 2; } - if(! is_zero(vec.x())){ + if(! is_zero(vec.hx())){ return 0; - } else if(! is_zero(vec.y())){ + } else if(! is_zero(vec.hy())){ return 1; - } else if(! is_zero(vec.z())){ + } else if(! is_zero(vec.hz())){ return 2; } diff --git a/Kernel_23/include/CGAL/Kernel/interface_macros.h b/Kernel_23/include/CGAL/Kernel/interface_macros.h index 8604fd1e20c..d0ba827fa37 100644 --- a/Kernel_23/include/CGAL/Kernel/interface_macros.h +++ b/Kernel_23/include/CGAL/Kernel/interface_macros.h @@ -582,8 +582,8 @@ CGAL_Kernel_pred(Less_y_3, less_y_3_object) CGAL_Kernel_pred(Less_z_3, less_z_3_object) -CGAL_Kernel_pred(Non_zero_dimension_3, - non_zero_dimension_3_object) +CGAL_Kernel_pred(Non_zero_coordinate_index_3, + non_zero_coordinate_index_3_object) CGAL_Kernel_pred_RT(Orientation_2, orientation_2_object) CGAL_Kernel_pred_RT(Orientation_3, diff --git a/Kernel_23/test/Kernel_23/CMakeLists.txt b/Kernel_23/test/Kernel_23/CMakeLists.txt index f171f3bc1d2..c59d7ceef93 100644 --- a/Kernel_23/test/Kernel_23/CMakeLists.txt +++ b/Kernel_23/test/Kernel_23/CMakeLists.txt @@ -1,12 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Kernel_23_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h index 4d6ab531bb4..70e273d1e68 100644 --- a/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h +++ b/Kernel_23/test/Kernel_23/include/CGAL/_test_fct_vector_3.h @@ -27,7 +27,7 @@ _test_fct_vector_3(const R& ) typedef typename R::RT RT; typedef typename R::FT FT; - typedef typename R::Non_zero_dimension_3 Non_zero_dimension_3; + typedef typename R::Non_zero_coordinate_index_3 Non_zero_coordinate_index_3; RT n0( 0 ); RT n1( 12 ); @@ -57,7 +57,7 @@ _test_fct_vector_3(const R& ) CGAL::Vector_3 v11(-n6, n11,-n12, n8);// ( 6, 8, -18) CGAL::Vector_3 v12(n1, n2, -n3, n4); // ( 6,-2, -3) - Non_zero_dimension_3 nzd; + Non_zero_coordinate_index_3 nzd; assert( nzd(v0) == -1 ); assert( nzd(v001) == 2 ); assert( nzd(v011) == 1 ); diff --git a/Kernel_d/test/Kernel_d/CMakeLists.txt b/Kernel_d/test/Kernel_d/CMakeLists.txt index fc2207e46f7..c44b7e2a388 100644 --- a/Kernel_d/test/Kernel_d/CMakeLists.txt +++ b/Kernel_d/test/Kernel_d/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Kernel_d_Tests) find_package(CGAL REQUIRED) diff --git a/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt index 919a067a71d..5a76521de3a 100644 --- a/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt +++ b/Linear_cell_complex/examples/Linear_cell_complex/CMakeLists.txt @@ -1,18 +1,9 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Linear_cell_complex_Examples) -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) # For Gprof. diff --git a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h index 5e1a46e52c7..73f360debfa 100644 --- a/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h +++ b/Linear_cell_complex/include/CGAL/draw_linear_cell_complex.h @@ -408,7 +408,7 @@ void draw(const CGAL_LCC_TYPE& alcc, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"lccviewer","\0"}; + const char* argv[2]={"lccviewer", nullptr}; QApplication app(argc,const_cast(argv)); SimpleLCCViewerQt mainwindow(app.activeWindow(), &alcc, title, nofill, drawing_functor); diff --git a/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt index 57bcfcd580b..b41fc5211b7 100644 --- a/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt +++ b/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Linear_cell_complex_Tests) find_package(CGAL REQUIRED) diff --git a/Matrix_search/examples/Matrix_search/CMakeLists.txt b/Matrix_search/examples/Matrix_search/CMakeLists.txt index a11de46da2e..d397e19eb52 100644 --- a/Matrix_search/examples/Matrix_search/CMakeLists.txt +++ b/Matrix_search/examples/Matrix_search/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Matrix_search_Examples) find_package(CGAL REQUIRED) diff --git a/Matrix_search/test/Matrix_search/CMakeLists.txt b/Matrix_search/test/Matrix_search/CMakeLists.txt index b268194df26..0c61fc5f495 100644 --- a/Matrix_search/test/Matrix_search/CMakeLists.txt +++ b/Matrix_search/test/Matrix_search/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Matrix_search_Tests) find_package(CGAL REQUIRED) diff --git a/Mesh_2/examples/Mesh_2/CMakeLists.txt b/Mesh_2/examples/Mesh_2/CMakeLists.txt index 7aae0f2be03..66e884cca6b 100644 --- a/Mesh_2/examples/Mesh_2/CMakeLists.txt +++ b/Mesh_2/examples/Mesh_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Mesh_2_Examples) find_package(CGAL REQUIRED) diff --git a/Mesh_2/test/Mesh_2/CMakeLists.txt b/Mesh_2/test/Mesh_2/CMakeLists.txt index 351903fa5b8..5f48b2001df 100644 --- a/Mesh_2/test/Mesh_2/CMakeLists.txt +++ b/Mesh_2/test/Mesh_2/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Mesh_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index c1230c541de..7dfb3ebb47a 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Mesh_3_Examples) add_definitions(-DCGAL_MESH_3_NO_DEPRECATED_SURFACE_INDEX diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt index bb118f9314b..4be36421434 100644 --- a/Mesh_3/test/Mesh_3/CMakeLists.txt +++ b/Mesh_3/test/Mesh_3/CMakeLists.txt @@ -2,18 +2,12 @@ # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project( Mesh_3_Tests ) - -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - find_package(CGAL QUIET COMPONENTS ImageIO) if ( CGAL_FOUND ) - include( ${CGAL_USE_FILE} ) find_package( TBB QUIET ) include(CGAL_TBB_support) diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt b/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt index 40564eb5578..add59c38b7e 100644 --- a/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt +++ b/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Minkowski_sum_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt b/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt index 4021f8076e7..4933d7aa991 100644 --- a/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt +++ b/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Minkowski_sum_2_Tests) # Commented out C++11 for now @@ -13,8 +13,6 @@ project(Minkowski_sum_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Minkowski_sum_3/examples/Minkowski_sum_3/CMakeLists.txt b/Minkowski_sum_3/examples/Minkowski_sum_3/CMakeLists.txt index 819fac40e53..3015b17e9ab 100644 --- a/Minkowski_sum_3/examples/Minkowski_sum_3/CMakeLists.txt +++ b/Minkowski_sum_3/examples/Minkowski_sum_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Minkowski_sum_3_Examples) find_package(CGAL REQUIRED) diff --git a/Minkowski_sum_3/test/Minkowski_sum_3/CMakeLists.txt b/Minkowski_sum_3/test/Minkowski_sum_3/CMakeLists.txt index a1eea351901..04c26cac13a 100644 --- a/Minkowski_sum_3/test/Minkowski_sum_3/CMakeLists.txt +++ b/Minkowski_sum_3/test/Minkowski_sum_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Minkowski_sum_3_Tests) find_package(CGAL REQUIRED) diff --git a/Modifier/test/Modifier/CMakeLists.txt b/Modifier/test/Modifier/CMakeLists.txt index 0bb9287406b..e809e5c3f77 100644 --- a/Modifier/test/Modifier/CMakeLists.txt +++ b/Modifier/test/Modifier/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Modifier_Tests) find_package(CGAL REQUIRED) diff --git a/Modular_arithmetic/examples/Modular_arithmetic/CMakeLists.txt b/Modular_arithmetic/examples/Modular_arithmetic/CMakeLists.txt index 8b8976b2a0b..5d630637670 100644 --- a/Modular_arithmetic/examples/Modular_arithmetic/CMakeLists.txt +++ b/Modular_arithmetic/examples/Modular_arithmetic/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Modular_arithmetic_Examples) find_package(CGAL REQUIRED) diff --git a/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt b/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt index 2c66e3a2456..48c8064b3ad 100644 --- a/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt +++ b/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Modular_arithmetic_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Nef_2/examples/Nef_2/CMakeLists.txt b/Nef_2/examples/Nef_2/CMakeLists.txt index 237a088f752..1c29b027bc1 100644 --- a/Nef_2/examples/Nef_2/CMakeLists.txt +++ b/Nef_2/examples/Nef_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Nef_2_Examples) find_package(CGAL REQUIRED) diff --git a/Nef_2/test/Nef_2/CMakeLists.txt b/Nef_2/test/Nef_2/CMakeLists.txt index 3ab543b3fe6..ce1345483cc 100644 --- a/Nef_2/test/Nef_2/CMakeLists.txt +++ b/Nef_2/test/Nef_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Nef_2_Tests) find_package(CGAL REQUIRED) diff --git a/Nef_3/examples/Nef_3/CMakeLists.txt b/Nef_3/examples/Nef_3/CMakeLists.txt index 56da2194291..24aba7e7101 100644 --- a/Nef_3/examples/Nef_3/CMakeLists.txt +++ b/Nef_3/examples/Nef_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Nef_3_Examples) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) diff --git a/Nef_3/include/CGAL/Nef_3/bounded_side_3.h b/Nef_3/include/CGAL/Nef_3/bounded_side_3.h index 691965fac24..8fd034517ef 100644 --- a/Nef_3/include/CGAL/Nef_3/bounded_side_3.h +++ b/Nef_3/include/CGAL/Nef_3/bounded_side_3.h @@ -38,8 +38,8 @@ Bounded_side bounded_side_3(IteratorForward first, CGAL_assertion(!plane.is_degenerate()); - typename R::Non_zero_dimension_3 non_zero_dimension_3; - int dir = non_zero_dimension_3(plane.orthogonal_vector()); + typename R::Non_zero_coordinate_index_3 non_zero_coordinate_index_3; + int dir = non_zero_coordinate_index_3(plane.orthogonal_vector()); if(dir == 0) { return bounded_side_2(first, last, point, YZ()); diff --git a/Nef_3/include/CGAL/draw_nef_3.h b/Nef_3/include/CGAL/draw_nef_3.h index 8a1f4a74931..5a81d639ea3 100644 --- a/Nef_3/include/CGAL/draw_nef_3.h +++ b/Nef_3/include/CGAL/draw_nef_3.h @@ -256,7 +256,7 @@ void draw(const CGAL_NEF3_TYPE &anef, { CGAL::Qt::init_ogl_context(4,3); int argc = 1; - const char *argv[2] = {"nef_polyhedron_viewer", "\0"}; + const char *argv[2] = {"nef_polyhedron_viewer", nullptr}; QApplication app(argc, const_cast(argv)); DefaultColorFunctorNefPolyhedron fcolor; SimpleNefPolyhedronViewerQt l) const { - return Iterator()(l.size(),l.begin(),l.end()); + return Iterator()(static_cast(l.size()),l.begin(),l.end()); } }; diff --git a/NewKernel_d/test/NewKernel_d/CMakeLists.txt b/NewKernel_d/test/NewKernel_d/CMakeLists.txt index a93427a2df3..65b2707ceb2 100644 --- a/NewKernel_d/test/NewKernel_d/CMakeLists.txt +++ b/NewKernel_d/test/NewKernel_d/CMakeLists.txt @@ -2,7 +2,7 @@ # This is the CMake script for compiling a CGAL application. # Then modified by hand to add Eigen3. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(NewKernel_d_Tests) if(CMAKE_COMPILER_IS_GNUCCX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4) diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt index 791f5ffd298..d65fbbcd3b3 100644 --- a/Number_types/test/Number_types/CMakeLists.txt +++ b/Number_types/test/Number_types/CMakeLists.txt @@ -3,12 +3,11 @@ # that dependency so as to test all the number types not depending on CORE # when it is not installed -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Number_types_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include(CGAL_VersionUtils) include_directories(BEFORE include) diff --git a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt index ff52fd6ef81..a7a806387db 100644 --- a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Optimal_bounding_box_Examples) find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) - find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) include(CGAL_Eigen3_support) if(NOT TARGET CGAL::Eigen3_support) diff --git a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt index b144a7fe34d..ead0b1d5c32 100644 --- a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt @@ -1,13 +1,11 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Optimal_bounding_box_Tests) find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) - find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) include(CGAL_Eigen3_support) if(NOT TARGET CGAL::Eigen3_support) diff --git a/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/CMakeLists.txt b/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/CMakeLists.txt index dfb29531ac9..cf106cf83f8 100644 --- a/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/CMakeLists.txt +++ b/Optimal_transportation_reconstruction_2/examples/Optimal_transportation_reconstruction_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Optimal_transportation_reconstruction_2_Examples) find_package(CGAL REQUIRED) diff --git a/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/CMakeLists.txt b/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/CMakeLists.txt index 6e7456c57c7..fa4d07b67d4 100644 --- a/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/CMakeLists.txt +++ b/Optimal_transportation_reconstruction_2/test/Optimal_transportation_reconstruction_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Optimal_transportation_reconstruction_2_Tests) find_package(CGAL REQUIRED) diff --git a/Orthtree/examples/Orthtree/CMakeLists.txt b/Orthtree/examples/Orthtree/CMakeLists.txt index 2fb386f27cb..ff97ac336ff 100644 --- a/Orthtree/examples/Orthtree/CMakeLists.txt +++ b/Orthtree/examples/Orthtree/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.14) +cmake_minimum_required(VERSION 3.1...3.22) project(Orthtree_Examples) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core) diff --git a/Orthtree/test/Orthtree/CMakeLists.txt b/Orthtree/test/Orthtree/CMakeLists.txt index 3fb78b8a578..eddcbebad8b 100644 --- a/Orthtree/test/Orthtree/CMakeLists.txt +++ b/Orthtree/test/Orthtree/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.14) +cmake_minimum_required(VERSION 3.1...3.22) project(Orthtree_Tests) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core) diff --git a/Partition_2/examples/Partition_2/CMakeLists.txt b/Partition_2/examples/Partition_2/CMakeLists.txt index b3c386e5153..086dfbba9c2 100644 --- a/Partition_2/examples/Partition_2/CMakeLists.txt +++ b/Partition_2/examples/Partition_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Partition_2_Examples) find_package(CGAL REQUIRED) diff --git a/Partition_2/test/Partition_2/CMakeLists.txt b/Partition_2/test/Partition_2/CMakeLists.txt index 0ba364b9639..60806661eb7 100644 --- a/Partition_2/test/Partition_2/CMakeLists.txt +++ b/Partition_2/test/Partition_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Partition_2_Tests) find_package(CGAL REQUIRED) diff --git a/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/CMakeLists.txt b/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/CMakeLists.txt index 68132516939..5b4eb21ba39 100644 --- a/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/CMakeLists.txt +++ b/Periodic_2_triangulation_2/examples/Periodic_2_triangulation_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Periodic_2_triangulation_2_Examples) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) diff --git a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h index fe0a13cf13a..395edef7a12 100644 --- a/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h +++ b/Periodic_2_triangulation_2/include/CGAL/draw_periodic_2_triangulation_2.h @@ -263,7 +263,7 @@ void draw(const CGAL_P2T2_TYPE& ap2t2, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"p2t2_viewer","\0"}; + const char* argv[2]={"p2t2_viewer", nullptr}; QApplication app(argc,const_cast(argv)); DefaultColorFunctorP2T2 fcolor; SimplePeriodic2Triangulation2ViewerQt& apointset, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"point_set_viewer","\0"}; + const char* argv[2]={"point_set_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimplePointSetViewerQt > mainwindow(app.activeWindow(), apointset, diff --git a/Point_set_3/test/Point_set_3/CMakeLists.txt b/Point_set_3/test/Point_set_3/CMakeLists.txt index d7d4d5259c6..233eacd31c2 100644 --- a/Point_set_3/test/Point_set_3/CMakeLists.txt +++ b/Point_set_3/test/Point_set_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Point_set_3_Tests) # CGAL and its components diff --git a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt index 3a41b17b3a2..924447080e0 100644 --- a/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling this folder. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Point_set_processing_3_Examples) # Find CGAL diff --git a/Point_set_processing_3/include/CGAL/estimate_scale.h b/Point_set_processing_3/include/CGAL/estimate_scale.h index fc243904199..f6eb57c4217 100644 --- a/Point_set_processing_3/include/CGAL/estimate_scale.h +++ b/Point_set_processing_3/include/CGAL/estimate_scale.h @@ -250,7 +250,7 @@ class Quick_multiscale_approximate_knn_distance::reference p2 = get(pmap.point_map, p); + const typename boost::property_traits::value_type& p2 = get(pmap.point_map, p); return value_type (p2.x(), p2.y(), 0.); } }; @@ -383,7 +383,7 @@ public: FT nb = 0.; std::size_t index = 0; - typename boost::property_traits::reference + const typename boost::property_traits::value_type& pquery = get(point_map, *query); for (std::size_t t = 0; t < m_point_sets.size(); ++ t) { @@ -495,7 +495,7 @@ estimate_local_k_neighbor_scales( using parameters::get_parameter; typedef typename CGAL::GetPointMap::const_type PointMap; - typedef typename Point_set_processing_3::GetQueryPointMap::const_type QueryPointMap; + typedef typename CGAL::GetPointMap::const_type QueryPointMap; typedef typename Point_set_processing_3::GetK::Kernel Kernel; typedef typename boost::property_traits::value_type Point_d; @@ -663,7 +663,7 @@ estimate_local_range_scales( using parameters::get_parameter; typedef typename CGAL::GetPointMap::const_type PointMap; - typedef typename Point_set_processing_3::GetQueryPointMap::const_type QueryPointMap; + typedef typename CGAL::GetPointMap::const_type QueryPointMap; typedef typename Point_set_processing_3::GetK::Kernel Kernel; typedef typename boost::property_traits::value_type Point_d; diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt index 684e26bb929..6b1e53dbb21 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling this folder. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Point_set_processing_3_Tests) # Find CGAL diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt index 82216044728..2d3ceccaba7 100644 --- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt +++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling this folder. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Poisson_surface_reconstruction_3_Examples) # Find CGAL diff --git a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt index dfec1da8952..71b83db624b 100644 --- a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt +++ b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling this folder. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Poisson_surface_reconstruction_3_Tests) # Find CGAL diff --git a/Polygon/examples/Polygon/CMakeLists.txt b/Polygon/examples/Polygon/CMakeLists.txt index 951b73b8a13..c658082a029 100644 --- a/Polygon/examples/Polygon/CMakeLists.txt +++ b/Polygon/examples/Polygon/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polygon_Examples) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) diff --git a/Polygon/include/CGAL/draw_polygon_2.h b/Polygon/include/CGAL/draw_polygon_2.h index 0e50e967fdb..1ab6ea14267 100644 --- a/Polygon/include/CGAL/draw_polygon_2.h +++ b/Polygon/include/CGAL/draw_polygon_2.h @@ -125,7 +125,7 @@ void draw(const CGAL::Polygon_2& ap2, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"t2_viewer","\0"}; + const char* argv[2]={"t2_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimplePolygon2ViewerQt > mainwindow(app.activeWindow(), ap2, title); diff --git a/Polygon/include/CGAL/draw_polygon_with_holes_2.h b/Polygon/include/CGAL/draw_polygon_with_holes_2.h index fd2ab34a7e5..be58464ebf8 100644 --- a/Polygon/include/CGAL/draw_polygon_with_holes_2.h +++ b/Polygon/include/CGAL/draw_polygon_with_holes_2.h @@ -145,7 +145,7 @@ void draw(const CGAL::Polygon_with_holes_2& ap2, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"t2_viewer","\0"}; + const char* argv[2]={"t2_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimplePolygonWithHoles2ViewerQt > mainwindow(app.activeWindow(), ap2, title); diff --git a/Polygon/test/Polygon/CMakeLists.txt b/Polygon/test/Polygon/CMakeLists.txt index 09d5653d0d1..ebc7d21b868 100644 --- a/Polygon/test/Polygon/CMakeLists.txt +++ b/Polygon/test/Polygon/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polygon_Tests) find_package(CGAL REQUIRED) diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt index 99ebc9a5b6d..03d04019afd 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polygon_mesh_processing_Examples) # CGAL and its components diff --git a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h index 9fbe92eaf6d..8d561e377f2 100644 --- a/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h +++ b/Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/distance.h @@ -1050,7 +1050,7 @@ double approximate_Hausdorff_distance( Point_3 hint = get(vpm, *vertices(tm).first); return internal::approximate_Hausdorff_distance_impl - (original_sample_points, tree, hint); + (sample_points, tree, hint); } template = -dj) - FT dj = distance_to_origin(plane) * CGAL::sign(plane.d()); + FT dj = distance_to_origin(plane) * static_cast(CGAL::sign(plane.d())); lp.set_b(j, -dj); } diff --git a/Polyhedron/examples/Polyhedron/CMakeLists.txt b/Polyhedron/examples/Polyhedron/CMakeLists.txt index b34cf1c2615..d2155f7698c 100644 --- a/Polyhedron/examples/Polyhedron/CMakeLists.txt +++ b/Polyhedron/examples/Polyhedron/CMakeLists.txt @@ -1,18 +1,9 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polyhedron_Examples) -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) # create a target per cppfile diff --git a/Polyhedron/include/CGAL/draw_polyhedron.h b/Polyhedron/include/CGAL/draw_polyhedron.h index e5220aa58f3..0866e27ebc0 100644 --- a/Polyhedron/include/CGAL/draw_polyhedron.h +++ b/Polyhedron/include/CGAL/draw_polyhedron.h @@ -46,8 +46,8 @@ void draw(const CGAL_POLY_TYPE& apoly, if (!cgal_test_suite) { CGAL::Qt::init_ogl_context(4,3); - int argc=2; - const char* argv[2]={"polyhedron_viewer","--old"}; + int argc=1; + const char* argv[2]={"polyhedron_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimpleFaceGraphViewerQt mainwindow(app.activeWindow(), apoly, title, nofill); diff --git a/Polyhedron/test/Polyhedron/CMakeLists.txt b/Polyhedron/test/Polyhedron/CMakeLists.txt index ae6f69df4d1..b3b67b1a1e7 100644 --- a/Polyhedron/test/Polyhedron/CMakeLists.txt +++ b/Polyhedron/test/Polyhedron/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polyhedron_Tests) find_package(CGAL REQUIRED) diff --git a/Polyline_simplification_2/examples/Polyline_simplification_2/CMakeLists.txt b/Polyline_simplification_2/examples/Polyline_simplification_2/CMakeLists.txt index 71d85755b9a..d57b16775ee 100644 --- a/Polyline_simplification_2/examples/Polyline_simplification_2/CMakeLists.txt +++ b/Polyline_simplification_2/examples/Polyline_simplification_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polyline_simplification_2_Examples) find_package(CGAL REQUIRED) diff --git a/Polyline_simplification_2/test/Polyline_simplification_2/CMakeLists.txt b/Polyline_simplification_2/test/Polyline_simplification_2/CMakeLists.txt index 367eb4ed021..5ecbca86606 100644 --- a/Polyline_simplification_2/test/Polyline_simplification_2/CMakeLists.txt +++ b/Polyline_simplification_2/test/Polyline_simplification_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polyline_simplification_2_Tests) # CGAL and its components diff --git a/Polynomial/examples/Polynomial/CMakeLists.txt b/Polynomial/examples/Polynomial/CMakeLists.txt index b12cdff6d74..ac50fa57851 100644 --- a/Polynomial/examples/Polynomial/CMakeLists.txt +++ b/Polynomial/examples/Polynomial/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polynomial_Examples) find_package(CGAL REQUIRED) diff --git a/Polynomial/test/Polynomial/CMakeLists.txt b/Polynomial/test/Polynomial/CMakeLists.txt index de1b93065bf..83469579bba 100644 --- a/Polynomial/test/Polynomial/CMakeLists.txt +++ b/Polynomial/test/Polynomial/CMakeLists.txt @@ -1,12 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polynomial_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Polytope_distance_d/examples/Polytope_distance_d/CMakeLists.txt b/Polytope_distance_d/examples/Polytope_distance_d/CMakeLists.txt index 294a3ade44d..6c9f960ea53 100644 --- a/Polytope_distance_d/examples/Polytope_distance_d/CMakeLists.txt +++ b/Polytope_distance_d/examples/Polytope_distance_d/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polytope_distance_d_Examples) find_package(CGAL REQUIRED) diff --git a/Polytope_distance_d/test/Polytope_distance_d/CMakeLists.txt b/Polytope_distance_d/test/Polytope_distance_d/CMakeLists.txt index 14d1216a743..db8fb47226a 100644 --- a/Polytope_distance_d/test/Polytope_distance_d/CMakeLists.txt +++ b/Polytope_distance_d/test/Polytope_distance_d/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Polytope_distance_d_Tests) find_package(CGAL REQUIRED) diff --git a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt index 7886f3d2c60..f66889a3544 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Principal_component_analysis_Examples) find_package(CGAL REQUIRED) diff --git a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt index 79e475babfd..8f6fe07d10b 100644 --- a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Principal_component_analysis_Tests) find_package(CGAL REQUIRED) diff --git a/Profiling_tools/examples/Profiling_tools/CMakeLists.txt b/Profiling_tools/examples/Profiling_tools/CMakeLists.txt index d7e2e4bb68c..883253391d0 100644 --- a/Profiling_tools/examples/Profiling_tools/CMakeLists.txt +++ b/Profiling_tools/examples/Profiling_tools/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Profiling_tools_Examples) find_package(CGAL REQUIRED) diff --git a/Profiling_tools/test/Profiling_tools/CMakeLists.txt b/Profiling_tools/test/Profiling_tools/CMakeLists.txt index c1cc51f5fd4..c160f66c74b 100644 --- a/Profiling_tools/test/Profiling_tools/CMakeLists.txt +++ b/Profiling_tools/test/Profiling_tools/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Profiling_tools_Tests) find_package(CGAL REQUIRED) diff --git a/Property_map/examples/Property_map/CMakeLists.txt b/Property_map/examples/Property_map/CMakeLists.txt index 25f4d037645..65f067a9055 100644 --- a/Property_map/examples/Property_map/CMakeLists.txt +++ b/Property_map/examples/Property_map/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Property_map_Examples) # CGAL and its components diff --git a/Property_map/include/CGAL/property_map.h b/Property_map/include/CGAL/property_map.h index 489305738c7..0dddeefd626 100644 --- a/Property_map/include/CGAL/property_map.h +++ b/Property_map/include/CGAL/property_map.h @@ -198,31 +198,43 @@ make_dereference_property_map(Iter) /// \ingroup PkgPropertyMapRef /// A `LvaluePropertyMap` property map mapping a key to itself (by reference). +/// It is mutable if `T` is not `const` and non-mutable otherwise. /// /// \cgalModels `LvaluePropertyMap` template struct Identity_property_map { +/// \cond SKIP_IN_MANUAL typedef Identity_property_map Self; - typedef T key_type; ///< typedef to `T` - typedef T value_type; ///< typedef to `T` - typedef const T& reference; ///< typedef to `const T&` - typedef boost::lvalue_property_map_tag category; ///< `boost::lvalue_property_map_tag` + typedef T key_type; + typedef T value_type; + typedef T& reference; + typedef boost::lvalue_property_map_tag category; - /// Access a property map element. - /// @param k a key which is returned as mapped value. - const value_type& operator[](const key_type& k) const { return k; } + value_type& operator[](key_type& k) const { return k; } - /// \name Put/get free functions - /// @{ - friend reference get(const Self&, const key_type& k) { return k; } + friend value_type& get(const Self&, key_type& k) { return k; } + friend const value_type& get(const Self&, const key_type& k) { return k; } friend void put(const Self&, key_type& k, const value_type& v) { k = v; } - /// @} +/// \endcond }; - /// \cond SKIP_IN_MANUAL +template +struct Identity_property_map +{ + typedef Identity_property_map Self; + + typedef T key_type; + typedef T value_type; + typedef const T& reference; + typedef boost::lvalue_property_map_tag category; + + const value_type& operator[](key_type& k) const { return k; } + friend const value_type& get(const Self&, const key_type& k) { return k; } +}; + template struct Identity_property_map_no_lvalue { @@ -399,7 +411,7 @@ struct Property_map_to_unary_function{ {} template - result_type + decltype(auto) operator()(const KeyType& a) const { return get(map,a); diff --git a/Property_map/test/Property_map/CMakeLists.txt b/Property_map/test/Property_map/CMakeLists.txt index 6108c680569..409a1363d8c 100644 --- a/Property_map/test/Property_map/CMakeLists.txt +++ b/Property_map/test/Property_map/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Property_map_Tests) # CGAL and its components diff --git a/QP_solver/examples/QP_solver/CMakeLists.txt b/QP_solver/examples/QP_solver/CMakeLists.txt index b266af6f313..76ba07ecc70 100644 --- a/QP_solver/examples/QP_solver/CMakeLists.txt +++ b/QP_solver/examples/QP_solver/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(QP_solver_Examples) find_package(CGAL REQUIRED) diff --git a/QP_solver/test/QP_solver/CMakeLists.txt b/QP_solver/test/QP_solver/CMakeLists.txt index 670ae37dd6e..0cb39ce10e8 100644 --- a/QP_solver/test/QP_solver/CMakeLists.txt +++ b/QP_solver/test/QP_solver/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(QP_solver_Tests) find_package(CGAL REQUIRED) diff --git a/Random_numbers/test/Random_numbers/CMakeLists.txt b/Random_numbers/test/Random_numbers/CMakeLists.txt index 2c2352c284c..fa4293383b0 100644 --- a/Random_numbers/test/Random_numbers/CMakeLists.txt +++ b/Random_numbers/test/Random_numbers/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Random_numbers_Tests) find_package(CGAL REQUIRED) diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt index c07e96b11f4..6a08efbecdb 100644 --- a/Ridges_3/examples/Ridges_3/CMakeLists.txt +++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt @@ -1,5 +1,5 @@ # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Ridges_3_Examples) find_package(CGAL REQUIRED) diff --git a/Ridges_3/test/Ridges_3/CMakeLists.txt b/Ridges_3/test/Ridges_3/CMakeLists.txt index 734ca326844..c9010b0b656 100644 --- a/Ridges_3/test/Ridges_3/CMakeLists.txt +++ b/Ridges_3/test/Ridges_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Ridges_3_Tests) find_package(CGAL REQUIRED) diff --git a/STL_Extension/examples/STL_Extension/CMakeLists.txt b/STL_Extension/examples/STL_Extension/CMakeLists.txt index 2ffd6f292e1..1b546213881 100644 --- a/STL_Extension/examples/STL_Extension/CMakeLists.txt +++ b/STL_Extension/examples/STL_Extension/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(STL_Extension_Examples) find_package(CGAL REQUIRED) diff --git a/STL_Extension/include/CGAL/Compact_container.h b/STL_Extension/include/CGAL/Compact_container.h index 15081283ede..6e64790a239 100644 --- a/STL_Extension/include/CGAL/Compact_container.h +++ b/STL_Extension/include/CGAL/Compact_container.h @@ -343,10 +343,10 @@ public: a.swap(b); } - iterator begin() { return iterator(first_item, 0, 0); } + iterator begin() { return empty()?end():iterator(first_item, 0, 0); } iterator end() { return iterator(last_item, 0); } - const_iterator begin() const { return const_iterator(first_item, 0, 0); } + const_iterator begin() const { return empty()?end():const_iterator(first_item, 0, 0); } const_iterator end() const { return const_iterator(last_item, 0); } reverse_iterator rbegin() { return reverse_iterator(end()); } @@ -732,7 +732,7 @@ void Compact_container::merge(Self size_ += d.size_; // Add the capacities. capacity_ += d.capacity_; - // It seems reasonnable to take the max of the block sizes. + // It seems reasonable to take the max of the block sizes. block_size = (std::max)(block_size, d.block_size); // Clear d. d.init(); diff --git a/STL_Extension/include/CGAL/Concurrent_compact_container.h b/STL_Extension/include/CGAL/Concurrent_compact_container.h index d3f60bbd381..7ba9befa3a3 100644 --- a/STL_Extension/include/CGAL/Concurrent_compact_container.h +++ b/STL_Extension/include/CGAL/Concurrent_compact_container.h @@ -313,10 +313,10 @@ public: a.swap(b); } - iterator begin() { return iterator(m_first_item, 0, 0); } + iterator begin() { return empty()?end():iterator(m_first_item, 0, 0); } iterator end() { return iterator(m_last_item, 0); } - const_iterator begin() const { return const_iterator(m_first_item, 0, 0); } + const_iterator begin() const { return empty()?end():const_iterator(m_first_item, 0, 0); } const_iterator end() const { return const_iterator(m_last_item, 0); } reverse_iterator rbegin() { return reverse_iterator(end()); } diff --git a/STL_Extension/test/STL_Extension/CMakeLists.txt b/STL_Extension/test/STL_Extension/CMakeLists.txt index 04cd4890de5..06f32e73106 100644 --- a/STL_Extension/test/STL_Extension/CMakeLists.txt +++ b/STL_Extension/test/STL_Extension/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project( STL_Extension_Tests ) diff --git a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt index 9e76d77a30b..08096b29d7d 100644 --- a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt +++ b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Scale_space_reconstruction_3_Examples) find_package(CGAL REQUIRED) diff --git a/SearchStructures/examples/RangeSegmentTrees/CMakeLists.txt b/SearchStructures/examples/RangeSegmentTrees/CMakeLists.txt index 01a1011e3c5..03c7fb346e3 100644 --- a/SearchStructures/examples/RangeSegmentTrees/CMakeLists.txt +++ b/SearchStructures/examples/RangeSegmentTrees/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(RangeSegmentTrees_Examples) find_package(CGAL REQUIRED) diff --git a/SearchStructures/test/RangeSegmentTrees/CMakeLists.txt b/SearchStructures/test/RangeSegmentTrees/CMakeLists.txt index 50781f78b24..3596f8c254e 100644 --- a/SearchStructures/test/RangeSegmentTrees/CMakeLists.txt +++ b/SearchStructures/test/RangeSegmentTrees/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(RangeSegmentTrees_Tests) find_package(CGAL REQUIRED) diff --git a/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/CMakeLists.txt b/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/CMakeLists.txt index 2126d7ca012..2017d066b3d 100644 --- a/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_2/examples/Segment_Delaunay_graph_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Segment_Delaunay_graph_2_Examples) find_package(CGAL REQUIRED) diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt index e084f7c46e2..71276880fba 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt @@ -1,12 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Segment_Delaunay_graph_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/CMakeLists.txt b/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/CMakeLists.txt index 896b3f6c33d..b08da350aa4 100644 --- a/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_Linf_2/examples/Segment_Delaunay_graph_Linf_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Segment_Delaunay_graph_Linf_2_Examples) find_package(CGAL REQUIRED) diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt index 93fce56bc77..b11e7464424 100644 --- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt @@ -1,12 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Segment_Delaunay_graph_Linf_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt b/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt index 6b08cd18f87..fc93eb68157 100644 --- a/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt +++ b/Set_movable_separability_2/examples/Set_movable_separability_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Set_movable_separability_2_Examples) list(FIND CMAKE_CXX_COMPILE_FEATURES cxx_generalized_initializers has_cpp11) diff --git a/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt b/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt index b5b6d7abdb4..ae9419d4515 100644 --- a/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt +++ b/Set_movable_separability_2/test/Set_movable_separability_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Set_movable_separability_2_Tests) if(RUNNING_CGAL_AUTO_TEST) diff --git a/Shape_detection/examples/Shape_detection/CMakeLists.txt b/Shape_detection/examples/Shape_detection/CMakeLists.txt index 3029f315f44..66dea5476f8 100644 --- a/Shape_detection/examples/Shape_detection/CMakeLists.txt +++ b/Shape_detection/examples/Shape_detection/CMakeLists.txt @@ -1,14 +1,11 @@ # Created by the script cgal_create_cmake_script. # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Shape_detection_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Use Eigen. find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/Shape_detection/test/Shape_detection/CMakeLists.txt b/Shape_detection/test/Shape_detection/CMakeLists.txt index e24e8fe6270..d579abba000 100644 --- a/Shape_detection/test/Shape_detection/CMakeLists.txt +++ b/Shape_detection/test/Shape_detection/CMakeLists.txt @@ -1,14 +1,11 @@ # Created by the script cgal_create_cmake_script. # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Shape_detection_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Use Eigen. find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt index 7320ff2fa0c..80af8f48e18 100644 --- a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt +++ b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt @@ -3,14 +3,11 @@ project(Shape_regularization_Examples) -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Find OSQP library and headers. find_package(OSQP QUIET) include(CGAL_OSQP_support) diff --git a/Shape_regularization/test/Shape_regularization/CMakeLists.txt b/Shape_regularization/test/Shape_regularization/CMakeLists.txt index 0f2d40b07c4..88bfd959824 100644 --- a/Shape_regularization/test/Shape_regularization/CMakeLists.txt +++ b/Shape_regularization/test/Shape_regularization/CMakeLists.txt @@ -3,14 +3,11 @@ project(Shape_regularization_Tests) -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Find OSQP library and headers. find_package(OSQP QUIET) include(CGAL_OSQP_support) diff --git a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt index 444464802c9..53a9ebd0786 100644 --- a/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt +++ b/Skin_surface_3/examples/Skin_surface_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Skin_surface_3_Examples) find_package(CGAL) diff --git a/Skin_surface_3/test/Skin_surface_3/CMakeLists.txt b/Skin_surface_3/test/Skin_surface_3/CMakeLists.txt index 2e174c9c42c..6f3c13f628d 100644 --- a/Skin_surface_3/test/Skin_surface_3/CMakeLists.txt +++ b/Skin_surface_3/test/Skin_surface_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Skin_surface_3_Tests) find_package(CGAL REQUIRED) diff --git a/Snap_rounding_2/examples/Snap_rounding_2/CMakeLists.txt b/Snap_rounding_2/examples/Snap_rounding_2/CMakeLists.txt index 027f8b3c683..4a6bb6b70a9 100644 --- a/Snap_rounding_2/examples/Snap_rounding_2/CMakeLists.txt +++ b/Snap_rounding_2/examples/Snap_rounding_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Snap_rounding_2_Examples) find_package(CGAL REQUIRED) diff --git a/Snap_rounding_2/test/Snap_rounding_2/CMakeLists.txt b/Snap_rounding_2/test/Snap_rounding_2/CMakeLists.txt index 11c89bb7567..16837f83076 100644 --- a/Snap_rounding_2/test/Snap_rounding_2/CMakeLists.txt +++ b/Snap_rounding_2/test/Snap_rounding_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Snap_rounding_2_Tests) find_package(CGAL REQUIRED) diff --git a/Solver_interface/examples/Solver_interface/CMakeLists.txt b/Solver_interface/examples/Solver_interface/CMakeLists.txt index c8626a2ce33..38376b897b6 100644 --- a/Solver_interface/examples/Solver_interface/CMakeLists.txt +++ b/Solver_interface/examples/Solver_interface/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Solver_interface_Examples) find_package(CGAL REQUIRED) diff --git a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt index 9585a99bc0c..dfa80bb8969 100644 --- a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt +++ b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Spatial_searching_Examples) # CGAL and its components diff --git a/Spatial_searching/test/Spatial_searching/CMakeLists.txt b/Spatial_searching/test/Spatial_searching/CMakeLists.txt index 82e58214772..5c9eebc4db5 100644 --- a/Spatial_searching/test/Spatial_searching/CMakeLists.txt +++ b/Spatial_searching/test/Spatial_searching/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Spatial_searching_Tests) find_package(CGAL REQUIRED) diff --git a/Spatial_sorting/examples/Spatial_sorting/CMakeLists.txt b/Spatial_sorting/examples/Spatial_sorting/CMakeLists.txt index ca9e5d49ca2..d05c5d6f0ac 100644 --- a/Spatial_sorting/examples/Spatial_sorting/CMakeLists.txt +++ b/Spatial_sorting/examples/Spatial_sorting/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Spatial_sorting_Examples) find_package(CGAL REQUIRED) diff --git a/Spatial_sorting/test/Spatial_sorting/CMakeLists.txt b/Spatial_sorting/test/Spatial_sorting/CMakeLists.txt index faaba976e1e..2d011ad455f 100644 --- a/Spatial_sorting/test/Spatial_sorting/CMakeLists.txt +++ b/Spatial_sorting/test/Spatial_sorting/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Spatial_sorting_Tests) find_package(CGAL REQUIRED) diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt index c1b809766d3..40985327413 100644 --- a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt +++ b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt @@ -1,15 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project( Straight_skeleton_2_Examples ) -find_package(CGAL REQUIRED COMPONENTS Core) - -find_package(CGAL COMPONENTS Qt5) - -include(${CGAL_USE_FILE}) +find_package(CGAL REQUIRED COMPONENTS Qt5 Core) # create a target per cppfile file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) diff --git a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h index 8bf2a8bf393..60a631250a1 100644 --- a/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h +++ b/Straight_skeleton_2/include/CGAL/draw_straight_skeleton_2.h @@ -162,7 +162,7 @@ void draw(const CGAL_SS_TYPE& ass2, if (!cgal_test_suite) { int argc=1; - const char* argv[2]={"ss2_viewer","\0"}; + const char* argv[2]={"ss2_viewer", nullptr}; QApplication app(argc,const_cast(argv)); DefaultColorFunctorSS2 fcolor; SimpleStraightSkeleton2ViewerQt diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt index 69ce1c69277..61d49cb3061 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt +++ b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt @@ -1,12 +1,11 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Straight_skeleton_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Stream_lines_2/examples/Stream_lines_2/CMakeLists.txt b/Stream_lines_2/examples/Stream_lines_2/CMakeLists.txt index dcd84756260..fa54b1ecd90 100644 --- a/Stream_lines_2/examples/Stream_lines_2/CMakeLists.txt +++ b/Stream_lines_2/examples/Stream_lines_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Stream_lines_2_Examples) find_package(CGAL REQUIRED) diff --git a/Stream_lines_2/test/Stream_lines_2/CMakeLists.txt b/Stream_lines_2/test/Stream_lines_2/CMakeLists.txt index e09e419243a..157fa5150de 100644 --- a/Stream_lines_2/test/Stream_lines_2/CMakeLists.txt +++ b/Stream_lines_2/test/Stream_lines_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Stream_lines_2_Tests) find_package(CGAL REQUIRED) diff --git a/Stream_support/examples/Stream_support/CMakeLists.txt b/Stream_support/examples/Stream_support/CMakeLists.txt index c73062122a8..b7c3b012bc5 100644 --- a/Stream_support/examples/Stream_support/CMakeLists.txt +++ b/Stream_support/examples/Stream_support/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Stream_support_Examples) find_package(CGAL REQUIRED) diff --git a/Stream_support/include/CGAL/IO/Generic_writer.h b/Stream_support/include/CGAL/IO/Generic_writer.h index 2f5d2a50d4a..b3d46b4fb77 100644 --- a/Stream_support/include/CGAL/IO/Generic_writer.h +++ b/Stream_support/include/CGAL/IO/Generic_writer.h @@ -54,7 +54,7 @@ public: m_writer.write_header(m_os, points.size(), 0, polygons.size()); for(std::size_t i=0, end=points.size(); i::reference p = get(point_map, points[i]); + const typename boost::property_traits::value_type& p = get(point_map, points[i]); m_writer.write_vertex(p.x(), p.y(), p.z()); } diff --git a/Stream_support/include/CGAL/IO/OFF/generic_copy_OFF.h b/Stream_support/include/CGAL/IO/OFF/generic_copy_OFF.h index 799691de51a..165859b3c80 100644 --- a/Stream_support/include/CGAL/IO/OFF/generic_copy_OFF.h +++ b/Stream_support/include/CGAL/IO/OFF/generic_copy_OFF.h @@ -71,12 +71,12 @@ generic_copy_OFF(File_scanner_OFF& scanner, if(! in) return; - std::size_t no; + std::size_t no = 0; scanner.scan_facet(no, i); writer.write_facet_begin(no); for(std::size_t j=0; j > > map) { - const typename PropertyMap::reference value = get(map.first, *it); + const typename PropertyMap::value_type& value = get(map.first, *it); if(CGAL::IO::get_mode(stream) == CGAL::IO::ASCII) { diff --git a/Stream_support/include/CGAL/IO/STL.h b/Stream_support/include/CGAL/IO/STL.h index 797376e8285..530dd5035f9 100644 --- a/Stream_support/include/CGAL/IO/STL.h +++ b/Stream_support/include/CGAL/IO/STL.h @@ -314,7 +314,6 @@ bool write_STL(std::ostream& os, PointMap point_map = choose_parameter(get_parameter(np, internal_np::point_map)); typedef typename boost::property_traits::value_type Point; - typedef typename boost::property_traits::reference Point_ref; typedef typename CGAL::Kernel_traits::Kernel K; typedef typename K::Vector_3 Vector_3; @@ -331,9 +330,9 @@ bool write_STL(std::ostream& os, for(const Triangle& face : facets) { - const Point_ref p = get(point_map, points[face[0]]); - const Point_ref q = get(point_map, points[face[1]]); - const Point_ref r = get(point_map, points[face[2]]); + const Point& p = get(point_map, points[face[0]]); + const Point& q = get(point_map, points[face[1]]); + const Point& r = get(point_map, points[face[2]]); const Vector_3 n = collinear(p,q,r) ? Vector_3(1,0,0) : unit_normal(p,q,r); @@ -352,9 +351,9 @@ bool write_STL(std::ostream& os, os << "solid\n"; for(const Triangle& face : facets) { - const Point_ref p = get(point_map, points[face[0]]); - const Point_ref q = get(point_map, points[face[1]]); - const Point_ref r = get(point_map, points[face[2]]); + const Point& p = get(point_map, points[face[0]]); + const Point& q = get(point_map, points[face[1]]); + const Point& r = get(point_map, points[face[2]]); const Vector_3 n = collinear(p,q,r) ? Vector_3(1,0,0) : unit_normal(p,q,r); os << "facet normal " << n << "\nouter loop\n"; diff --git a/Stream_support/test/Stream_support/CMakeLists.txt b/Stream_support/test/Stream_support/CMakeLists.txt index c87fb5996af..756e8ac9469 100644 --- a/Stream_support/test/Stream_support/CMakeLists.txt +++ b/Stream_support/test/Stream_support/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Stream_support_Tests) find_package(CGAL REQUIRED) find_path( diff --git a/Subdivision_method_3/examples/Subdivision_method_3/CMakeLists.txt b/Subdivision_method_3/examples/Subdivision_method_3/CMakeLists.txt index b459d332ef5..fd9c63834c5 100644 --- a/Subdivision_method_3/examples/Subdivision_method_3/CMakeLists.txt +++ b/Subdivision_method_3/examples/Subdivision_method_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Subdivision_method_3_Examples) find_package(CGAL REQUIRED) diff --git a/Subdivision_method_3/test/Subdivision_method_3/CMakeLists.txt b/Subdivision_method_3/test/Subdivision_method_3/CMakeLists.txt index bd9cc24c60d..7472cdbf1dd 100644 --- a/Subdivision_method_3/test/Subdivision_method_3/CMakeLists.txt +++ b/Subdivision_method_3/test/Subdivision_method_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Subdivision_method_3_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_mesh/examples/Surface_mesh/CMakeLists.txt b/Surface_mesh/examples/Surface_mesh/CMakeLists.txt index 228d384f295..38006df82c1 100644 --- a/Surface_mesh/examples/Surface_mesh/CMakeLists.txt +++ b/Surface_mesh/examples/Surface_mesh/CMakeLists.txt @@ -6,22 +6,9 @@ # Used in /CGAL/Documentation/doc/Documentation/Developer_manual/create_and_use_a_cmakelist.txt. # Careful when modifying -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_Examples) -if(POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - if(NOT POLICY CMP0070) - cmake_policy(SET CMP0053 OLD) - else() - cmake_policy(SET CMP0053 NEW) - endif() -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - #CGAL_Qt5 is needed for the drawing. find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) diff --git a/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h b/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h index 39a89eac77c..0e5043c8f08 100644 --- a/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h +++ b/Surface_mesh/examples/Surface_mesh/draw_surface_mesh_small_faces.h @@ -263,7 +263,7 @@ void draw_surface_mesh_with_small_faces(CGAL::Surface_mesh& amesh) if (!cgal_test_suite) { int argc=1; - const char* argv[2]={"surface_mesh_viewer","\0"}; + const char* argv[2]={"surface_mesh_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimpleSurfaceMeshWithSmallFacesViewerQt> mainwindow(app.activeWindow(), amesh); diff --git a/Surface_mesh/include/CGAL/draw_surface_mesh.h b/Surface_mesh/include/CGAL/draw_surface_mesh.h index 6f34dfefc44..3459392aec1 100644 --- a/Surface_mesh/include/CGAL/draw_surface_mesh.h +++ b/Surface_mesh/include/CGAL/draw_surface_mesh.h @@ -55,7 +55,7 @@ void draw(const Surface_mesh& amesh, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"surface_mesh_viewer","\0"}; + const char* argv[2]={"surface_mesh_viewer", nullptr}; QApplication app(argc,const_cast(argv)); SimpleFaceGraphViewerQt mainwindow(app.activeWindow(), amesh, title, nofill); diff --git a/Surface_mesh/test/Surface_mesh/CMakeLists.txt b/Surface_mesh/test/Surface_mesh/CMakeLists.txt index eea7f733856..f0ff3435244 100644 --- a/Surface_mesh/test/Surface_mesh/CMakeLists.txt +++ b/Surface_mesh/test/Surface_mesh/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt index 17e67899cc2..634b2b3d4a9 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt @@ -1,15 +1,12 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_approximation_Examples) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost find_package(Boost) if(NOT Boost_FOUND) @@ -30,8 +27,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("vsa_approximation_2_example.cpp") target_link_libraries(vsa_approximation_2_example PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt index 84735eac579..f64eb2fc9a7 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt @@ -1,15 +1,12 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_approximation_Tests) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost find_package(Boost) if(NOT Boost_FOUND) @@ -30,8 +27,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("vsa_class_interface_test.cpp") target_link_libraries(vsa_class_interface_test PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt index 1439d38e285..a43ade52df2 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_deformation_Examples) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt index 2d786089ea4..c546f087cea 100644 --- a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_deformation_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index 03a5dabfbb1..d3a9dcad62f 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling this folder. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_parameterization_Examples) # Find CGAL diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt index 61dddb9a187..06cf7395c18 100644 --- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt @@ -1,6 +1,6 @@ # This is the CMake script for compiling this folder. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_parameterization_Tests) # Find CGAL diff --git a/Surface_mesh_segmentation/examples/Surface_mesh_segmentation/CMakeLists.txt b/Surface_mesh_segmentation/examples/Surface_mesh_segmentation/CMakeLists.txt index 50a7f0a8bfa..641e30741e4 100644 --- a/Surface_mesh_segmentation/examples/Surface_mesh_segmentation/CMakeLists.txt +++ b/Surface_mesh_segmentation/examples/Surface_mesh_segmentation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script_with_options # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_segmentation_Examples) # CGAL and its components diff --git a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/CMakeLists.txt b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/CMakeLists.txt index 747fde4886d..783f2400d7e 100644 --- a/Surface_mesh_segmentation/test/Surface_mesh_segmentation/CMakeLists.txt +++ b/Surface_mesh_segmentation/test/Surface_mesh_segmentation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_segmentation_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt b/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt index 65e28fab2d2..9e1addaf2e7 100644 --- a/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt +++ b/Surface_mesh_shortest_path/examples/Surface_mesh_shortest_path/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_shortest_path_Examples) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt index f5a4fd2a4fc..2ab7700b686 100644 --- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt +++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt @@ -1,10 +1,8 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_shortest_path_Tests) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core) -include(${CGAL_USE_FILE}) - find_package(LEDA QUIET) include_directories(BEFORE "include") diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt index 0775b1d9c33..aa4b1a960d0 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt @@ -1,14 +1,12 @@ # Created by the script cgal_create_cmake_script_with_options # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_simplification_Examples) # CGAL and its components find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost) if(NOT Boost_FOUND) diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt index ce3257ca6b5..7a83ad3f059 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_simplification_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt index 130ac4cc43c..b15cda82583 100644 --- a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_skeletonization_Examples) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt index f61af9891dc..61c65058b51 100644 --- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_skeletonization_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt b/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt index 45a0fcebbea..53106ce0049 100644 --- a/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt +++ b/Surface_mesh_topology/doc/Surface_mesh_topology/PackageDescription.txt @@ -17,7 +17,7 @@ /*! \addtogroup PkgSurfaceMeshTopology -\cgalPkgDescriptionBegin{Surface Mesh Topology,PkgSurfaceMeshTopologySummary} +\cgalPkgDescriptionBegin{Surface Mesh Topology,PkgSurfaceMeshTopology} \cgalPkgPicture{surface-mesh-topology-logo.png} \cgalPkgSummaryBegin \cgalPkgAuthor{Guillaume Damiand, Francis Lazarus} diff --git a/Surface_mesh_topology/examples/Surface_mesh_topology/CMakeLists.txt b/Surface_mesh_topology/examples/Surface_mesh_topology/CMakeLists.txt index cd7a003004a..1c3b2c6d00f 100644 --- a/Surface_mesh_topology/examples/Surface_mesh_topology/CMakeLists.txt +++ b/Surface_mesh_topology/examples/Surface_mesh_topology/CMakeLists.txt @@ -1,15 +1,6 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_topology_Examples) -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) # add_definitions(-DCGAL_TRACE_PATH_TESTS) diff --git a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h index 6a1e01e22fe..6b8ae90e6fa 100644 --- a/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h +++ b/Surface_mesh_topology/include/CGAL/draw_face_graph_with_paths.h @@ -412,7 +412,7 @@ void draw(const Mesh& alcc, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"lccviewer","\0"}; + const char* argv[1]={"lccviewer"}; QApplication app(argc,const_cast(argv)); Face_graph_with_path_viewer mainwindow(app.activeWindow(), alcc, &paths, amark, diff --git a/Surface_mesh_topology/test/Surface_mesh_topology/CMakeLists.txt b/Surface_mesh_topology/test/Surface_mesh_topology/CMakeLists.txt index ea96544f2a7..326a846e0a3 100644 --- a/Surface_mesh_topology/test/Surface_mesh_topology/CMakeLists.txt +++ b/Surface_mesh_topology/test/Surface_mesh_topology/CMakeLists.txt @@ -1,15 +1,6 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesh_topology_Tests) -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) # add_definitions(-DCGAL_TRACE_PATH_TESTS) diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt index 20f0d37f023..5477ae22041 100644 --- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt @@ -1,18 +1,12 @@ # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesher_Examples) -if(POLICY CMP0074) - cmake_policy(SET CMP0074 NEW) -endif() - find_package(CGAL REQUIRED COMPONENTS ImageIO) if(CGAL_ImageIO_FOUND) - include(${CGAL_USE_FILE}) - create_single_source_cgal_program("mesh_a_3d_gray_image.cpp") create_single_source_cgal_program("mesh_an_implicit_function.cpp") diff --git a/Surface_mesher/test/Surface_mesher/CMakeLists.txt b/Surface_mesher/test/Surface_mesher/CMakeLists.txt index db9b47ce15e..8d362d54331 100644 --- a/Surface_mesher/test/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/test/Surface_mesher/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_mesher_Tests) find_package(CGAL REQUIRED) diff --git a/Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt b/Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt index 5dfec2db23b..7cf467be288 100644 --- a/Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt +++ b/Surface_sweep_2/examples/Surface_sweep_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_sweep_2_Examples) # CGAL and its components diff --git a/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt b/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt index a027fcd675b..6bc64ec7601 100644 --- a/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt +++ b/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Surface_sweep_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) @@ -15,14 +15,14 @@ set(TRAP 1) # Trapezoidal decomposition set(NAIVE 2) set(WALK 3) -include(${CGAL_USE_FILE}) - function(compile name source_file point_location traits) # message(compile ${source_file}) add_executable(${name} ${source_file}) add_to_cached_list(CGAL_EXECUTABLE_TARGETS ${name}) if(TARGET CGAL::CGAL_Core) target_link_libraries(${name} CGAL::CGAL CGAL::CGAL_Core) + else() + target_link_libraries(${name} CGAL::CGAL) endif() target_compile_definitions( ${name} PRIVATE -DCGAL_ARR_TEST_POINT_LOCATION=${point_location} diff --git a/TDS_2/test/TDS_2/CMakeLists.txt b/TDS_2/test/TDS_2/CMakeLists.txt index e4cc32d9db1..eebe6ac40e1 100644 --- a/TDS_2/test/TDS_2/CMakeLists.txt +++ b/TDS_2/test/TDS_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(TDS_2_Tests) find_package(CGAL REQUIRED) diff --git a/TDS_3/examples/TDS_3/CMakeLists.txt b/TDS_3/examples/TDS_3/CMakeLists.txt index 676466f3a0e..f91cc2ac9e4 100644 --- a/TDS_3/examples/TDS_3/CMakeLists.txt +++ b/TDS_3/examples/TDS_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(TDS_3_Examples) find_package(CGAL REQUIRED) diff --git a/TDS_3/test/TDS_3/CMakeLists.txt b/TDS_3/test/TDS_3/CMakeLists.txt index 8d297767ac7..d55b69a742c 100644 --- a/TDS_3/test/TDS_3/CMakeLists.txt +++ b/TDS_3/test/TDS_3/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(TDS_3_Tests) find_package(CGAL REQUIRED) diff --git a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt index 4c6200c1713..d52c2b787ac 100644 --- a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Tetrahedral_remeshing_Examples) diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt index 828e168c0cc..d9fb79da588 100644 --- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_CMakeLists # This is the CMake script for compiling a set of CGAL applications. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Tetrahedral_remeshing_Tests) diff --git a/Three/include/CGAL/Three/exceptions.h b/Three/include/CGAL/Three/exceptions.h index 2b8e9d3ad82..cf3640d5b46 100644 --- a/Three/include/CGAL/Three/exceptions.h +++ b/Three/include/CGAL/Three/exceptions.h @@ -67,13 +67,13 @@ enum Context { CURRENT_CONTEXT, PARENT_CONTEXT }; /// exception. That allows a Qt Script to catch the exception and deal /// with it. template -typename Optional_or_bool::type>::type +typename Optional_or_bool::type>::type wrap_a_call_to_cpp(Callable f, QScriptable* qs = 0, const char* file = 0, int line = -1, Context c = CURRENT_CONTEXT) { - typedef typename std::result_of::type Callable_RT; + typedef typename cpp11::result_of::type Callable_RT; typedef Optional_or_bool O_r_b; typedef typename O_r_b::type Return_type; diff --git a/Triangulation/examples/Triangulation/CMakeLists.txt b/Triangulation/examples/Triangulation/CMakeLists.txt index af19fba9e0e..e89cf2dc75c 100644 --- a/Triangulation/examples/Triangulation/CMakeLists.txt +++ b/Triangulation/examples/Triangulation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Triangulation_Examples) if(CMAKE_COMPILER_IS_GNUCCX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4) diff --git a/Triangulation/test/Triangulation/CMakeLists.txt b/Triangulation/test/Triangulation/CMakeLists.txt index 81a23848d80..4e7712753e1 100644 --- a/Triangulation/test/Triangulation/CMakeLists.txt +++ b/Triangulation/test/Triangulation/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Triangulation_Tests) if(CMAKE_COMPILER_IS_GNUCCX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4) diff --git a/Triangulation_2/examples/Triangulation_2/CMakeLists.txt b/Triangulation_2/examples/Triangulation_2/CMakeLists.txt index 55c748576aa..f5af1d45f31 100644 --- a/Triangulation_2/examples/Triangulation_2/CMakeLists.txt +++ b/Triangulation_2/examples/Triangulation_2/CMakeLists.txt @@ -1,18 +1,9 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Triangulation_2_Examples) -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) # create a target per cppfile diff --git a/Triangulation_2/include/CGAL/draw_triangulation_2.h b/Triangulation_2/include/CGAL/draw_triangulation_2.h index 3561dbbc04a..9fabd041833 100644 --- a/Triangulation_2/include/CGAL/draw_triangulation_2.h +++ b/Triangulation_2/include/CGAL/draw_triangulation_2.h @@ -147,7 +147,7 @@ void draw(const CGAL_T2_TYPE& at2, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"t2_viewer","\0"}; + const char* argv[2]={"t2_viewer", nullptr}; QApplication app(argc,const_cast(argv)); DefaultColorFunctorT2 fcolor; SimpleTriangulation2ViewerQt diff --git a/Triangulation_2/test/Triangulation_2/CMakeLists.txt b/Triangulation_2/test/Triangulation_2/CMakeLists.txt index 54c09717f8f..8363ae7b4f9 100644 --- a/Triangulation_2/test/Triangulation_2/CMakeLists.txt +++ b/Triangulation_2/test/Triangulation_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Triangulation_2_Tests) find_package(CGAL REQUIRED) diff --git a/Triangulation_3/examples/Triangulation_3/CMakeLists.txt b/Triangulation_3/examples/Triangulation_3/CMakeLists.txt index 5890bde4df4..a5987683a74 100644 --- a/Triangulation_3/examples/Triangulation_3/CMakeLists.txt +++ b/Triangulation_3/examples/Triangulation_3/CMakeLists.txt @@ -1,15 +1,6 @@ -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Triangulation_3_Examples) -if(NOT POLICY CMP0070 AND POLICY CMP0053) - # Only set CMP0053 to OLD with CMake<3.10, otherwise there is a warning. - cmake_policy(SET CMP0053 OLD) -endif() - -if(POLICY CMP0071) - cmake_policy(SET CMP0071 NEW) -endif() - find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) include_directories(BEFORE "../../include") diff --git a/Triangulation_3/include/CGAL/draw_triangulation_3.h b/Triangulation_3/include/CGAL/draw_triangulation_3.h index 3e5bbaec9f5..d7b294fa164 100644 --- a/Triangulation_3/include/CGAL/draw_triangulation_3.h +++ b/Triangulation_3/include/CGAL/draw_triangulation_3.h @@ -153,7 +153,7 @@ void draw(const CGAL_T3_TYPE& at3, { CGAL::Qt::init_ogl_context(4,3); int argc=1; - const char* argv[2]={"t3_viewer","\0"}; + const char* argv[2]={"t3_viewer", nullptr}; QApplication app(argc,const_cast(argv)); DefaultColorFunctorT3 fcolor; SimpleTriangulation3ViewerQt diff --git a/Triangulation_3/test/Triangulation_3/CMakeLists.txt b/Triangulation_3/test/Triangulation_3/CMakeLists.txt index 68865922e11..0cee5c47bfb 100644 --- a/Triangulation_3/test/Triangulation_3/CMakeLists.txt +++ b/Triangulation_3/test/Triangulation_3/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Triangulation_3_Tests) find_package(CGAL REQUIRED) diff --git a/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt index bc7d1afaea6..861e0a85bd0 100644 --- a/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt +++ b/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt @@ -44,6 +44,9 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND AND TARGET CGAL::Eigen3_support) add_to_cached_list( CGAL_EXECUTABLE_TARGETS Triangulation_on_sphere_2_Demo ) target_link_libraries( Triangulation_on_sphere_2_Demo PRIVATE CGAL::CGAL CGAL::CGAL_Qt5 CGAL::Eigen3_support) + + include(${CGAL_MODULES_DIR}/CGAL_add_test.cmake) + cgal_add_compilation_test( Triangulation_on_sphere_2_Demo ) else() message(STATUS "NOTICE: This demo requires CGAL, the QGLViewer, OpenGL and Qt4, and will not be compiled.") endif() diff --git a/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/CMakeLists.txt index 50db0ec20b1..d92cb62abaa 100644 --- a/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/CMakeLists.txt +++ b/Triangulation_on_sphere_2/examples/Triangulation_on_sphere_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) project( Triangulation_on_sphere_2_Examples ) diff --git a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt index c661c63eecf..cafd2124f03 100644 --- a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt +++ b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) project( Triangulation_on_sphere_2_Tests ) diff --git a/Union_find/test/Union_find/CMakeLists.txt b/Union_find/test/Union_find/CMakeLists.txt index b08c8acccd6..aeda92709a0 100644 --- a/Union_find/test/Union_find/CMakeLists.txt +++ b/Union_find/test/Union_find/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Union_find_Tests) find_package(CGAL REQUIRED) diff --git a/Visibility_2/examples/Visibility_2/CMakeLists.txt b/Visibility_2/examples/Visibility_2/CMakeLists.txt index 49d44165a98..10fbbcd6919 100644 --- a/Visibility_2/examples/Visibility_2/CMakeLists.txt +++ b/Visibility_2/examples/Visibility_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Visibility_2_Examples) find_package(CGAL REQUIRED) diff --git a/Visibility_2/test/Visibility_2/CMakeLists.txt b/Visibility_2/test/Visibility_2/CMakeLists.txt index 0406b2f6510..64d5d215a29 100644 --- a/Visibility_2/test/Visibility_2/CMakeLists.txt +++ b/Visibility_2/test/Visibility_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Visibility_2_Tests) find_package(CGAL REQUIRED) diff --git a/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt index ac4455b27a9..5d1c98ea973 100644 --- a/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt +++ b/Voronoi_diagram_2/examples/Voronoi_diagram_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Voronoi_diagram_2_Examples) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt5) diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h index b14991c03f3..6b2c567866b 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Circulator_adaptors.h @@ -71,13 +71,13 @@ class Circulator_from_halfedge_adaptor typename Base::pointer operator->() { return &cur_; } typename Base::reference operator*() { return cur_; } - bool operator==(const Circulator& other) const { - return cur_ == other.cur_; + friend bool operator==(const Circulator& c, const Circulator& other) { + return c.cur_ == other.cur_; } - bool operator!=(const Circulator& other) const { - return cur_ != other.cur_; + friend bool operator!=(const Circulator& c, const Circulator& other) { + return c.cur_ != other.cur_; } protected: diff --git a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h index d88aae38e88..7efc4d6429f 100644 --- a/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h +++ b/Voronoi_diagram_2/include/CGAL/Voronoi_diagram_2/Iterator_adaptors.h @@ -85,13 +85,13 @@ class Iterator_adaptor_base return tmp; } - bool operator==(const Iterator& other) const { + bool operator==(const Self& other) const { if ( vda_ == nullptr ) { return other.vda_ == nullptr; } if ( other.vda_ == nullptr ) { return vda_ == nullptr; } return ( vda_ == other.vda_ && cur_ == other.cur_ ); } - bool operator!=(const Iterator& other) const { + bool operator!=(const Self& other) const { return !(*this == other); } @@ -235,12 +235,12 @@ private: return *this; } - bool operator==(const Self& other) const { - return Base::operator==(other) && is_first_ == other.is_first_; + friend bool operator==(const Self& i, const Self& other) { + return i.Base::operator==(other) && i.is_first_ == other.is_first_; } - bool operator!=(const Self& other) const { - return !(*this == other); + friend bool operator!=(const Self& i, const Self& other) { + return !(i == other); } private: diff --git a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h index 3ccb450b14f..f92e9af630e 100644 --- a/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h +++ b/Voronoi_diagram_2/include/CGAL/draw_voronoi_diagram_2.h @@ -319,7 +319,7 @@ void draw(const CGAL_VORONOI_TYPE &av2, if (!cgal_test_suite) { CGAL::Qt::init_ogl_context(4,3); int argc = 1; - const char *argv[2] = {"voronoi_2_viewer", "\0"}; + const char *argv[2] = {"voronoi_2_viewer", nullptr}; QApplication app(argc, const_cast(argv)); DefaultColorFunctorV2 fcolor; SimpleVoronoiDiagram2ViewerQt diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt index ab76fa8aad6..01914766681 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt @@ -1,7 +1,7 @@ # Created by the script cgal_create_cmake_script # This is the CMake script for compiling a CGAL application. -cmake_minimum_required(VERSION 3.1...3.20) +cmake_minimum_required(VERSION 3.1...3.22) project(Voronoi_diagram_2_Tests) find_package(CGAL REQUIRED) diff --git a/Weights/doc/Weights/PackageDescription.txt b/Weights/doc/Weights/PackageDescription.txt index d190cf942cc..b3c78d87b5f 100644 --- a/Weights/doc/Weights/PackageDescription.txt +++ b/Weights/doc/Weights/PackageDescription.txt @@ -509,7 +509,7 @@ a model of `AnalyticWeightTraits_3` for 3D points \addtogroup PkgWeightsRef -\cgalPkgDescriptionBegin{Weight Interface, PkgWeightsRef} +\cgalPkgDescriptionBegin{Weight Interface, PkgWeights} \cgalPkgPicture{weights_logo_120x120.png} \cgalPkgSummaryBegin diff --git a/Weights/doc/Weights/Weights.txt b/Weights/doc/Weights/Weights.txt index 911f6dd7bc5..96b58a16f27 100644 --- a/Weights/doc/Weights/Weights.txt +++ b/Weights/doc/Weights/Weights.txt @@ -45,7 +45,7 @@ the following \cgal packages make use of weights described in this package: \ref PkgSurfaceMeshDeformation "Triangulated Surface Mesh Deformation", \ref PkgSurfaceMeshParameterization "Triangulated Surface Mesh Parameterization", \ref PkgSurfaceMeshSkeletonization "Triangulated Surface Mesh Skeletonization", and -\ref PkgHeatMethodSummary "The Heat Method". +\ref PkgHeatMethod "The Heat Method". \section Weights_Groups Weights diff --git a/Weights/examples/Weights/CMakeLists.txt b/Weights/examples/Weights/CMakeLists.txt index be8efdb3bc6..14ee12624ab 100644 --- a/Weights/examples/Weights/CMakeLists.txt +++ b/Weights/examples/Weights/CMakeLists.txt @@ -3,12 +3,10 @@ project(Weights_Examples) -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("weights.cpp") create_single_source_cgal_program("coordinates_one_query.cpp") diff --git a/Weights/test/Weights/CMakeLists.txt b/Weights/test/Weights/CMakeLists.txt index e0a968fea0a..acfc596cbcc 100644 --- a/Weights/test/Weights/CMakeLists.txt +++ b/Weights/test/Weights/CMakeLists.txt @@ -3,12 +3,10 @@ project(Weights_Tests) -cmake_minimum_required(VERSION 3.1...3.15) +cmake_minimum_required(VERSION 3.1...3.22) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("test_uniform_weights.cpp") create_single_source_cgal_program("test_shepard_weights.cpp")