From a831f0e855bf8283bc4b37b14a35ed490652a375 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 5 Nov 2024 09:17:07 +0100 Subject: [PATCH 1/3] fix function signature --- Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h index 65240b519ce..e863dbe5393 100644 --- a/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h +++ b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h @@ -62,7 +62,7 @@ typedef unspecified_type Construct_cartesian_const_iterator_d; /*! Function used to construct an object of type `Construct_cartesian_const_iterator_d`. */ -Construct_cartesian_const_iterator_d construct_construct_cartesian_const_iterator_d_object(const Point_d& p) const; +Construct_cartesian_const_iterator_d construct_cartesian_const_iterator_d_object() const; /// @} From c8438d4310a0ab99de8b0351e6a32e4dc68b6530 Mon Sep 17 00:00:00 2001 From: Sven Oesau Date: Wed, 6 Nov 2024 16:10:15 +0100 Subject: [PATCH 2/3] removing the version check for OpenGR --- .../examples/Point_set_processing_3/CMakeLists.txt | 10 ++-------- .../Polyhedron/Plugins/Point_set/CMakeLists.txt | 13 ++++--------- 2 files changed, 6 insertions(+), 17 deletions(-) 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 7d2b2c8b872..0078d757d3c 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 @@ -121,14 +121,8 @@ if(TARGET CGAL::Eigen3_support) endif() # Executables that require OpenGR - if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910) - find_package(OpenGR QUIET) - include(CGAL_OpenGR_support) - message( - STATUS - "NOTICE : OpenGR does not support your compiler, registration_with_OpenGR will not be compiled." - ) - endif() + find_package(OpenGR QUIET) + include(CGAL_OpenGR_support) if(TARGET CGAL::OpenGR_support) create_single_source_cgal_program("registration_with_OpenGR.cpp") diff --git a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt b/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt index 3232d08a8d7..00c76007dd5 100644 --- a/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt +++ b/Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt @@ -90,15 +90,10 @@ if(TARGET CGAL::Eigen3_support) point_set_shape_detection_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support) - if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910) - find_package(OpenGR QUIET) - include(CGAL_OpenGR_support) - else() - message( - STATUS - "NOTICE : OpenGR does not support your compiler." - ) - endif() + + find_package(OpenGR QUIET) + include(CGAL_OpenGR_support) + find_package(libpointmatcher QUIET) include(CGAL_pointmatcher_support) From 7cd3a8e65305393c9a8d2380e485950e97c70afe Mon Sep 17 00:00:00 2001 From: Guillaume Damiand Date: Mon, 4 Nov 2024 12:54:30 +0100 Subject: [PATCH 3/3] Add missing methods ignore_all_XXX in graphics scene options (methods that are documented) --- Basic_viewer/include/CGAL/Graphics_scene_options.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Basic_viewer/include/CGAL/Graphics_scene_options.h b/Basic_viewer/include/CGAL/Graphics_scene_options.h index b610665ed40..b1cefd56df2 100644 --- a/Basic_viewer/include/CGAL/Graphics_scene_options.h +++ b/Basic_viewer/include/CGAL/Graphics_scene_options.h @@ -74,14 +74,17 @@ struct Graphics_scene_options