Merge remote-tracking branch 'cgal/6.0.x-branch'

CGAL · Nov 8, 2024 · 797dde5 · 797dde5
2 parents 0466731 + 79ac9d9
commit 797dde5
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 18 deletions.
diff --git 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<DS, VertexDescriptor, EdgeDescriptor, FaceDescript
   void disable_vertices() { m_enabled_vertices=false; }
   void enable_vertices() { m_enabled_vertices=true; }
   bool are_vertices_enabled() const { return m_enabled_vertices; }
+  void ignore_all_vertices(bool b) { m_enabled_vertices=!b; }
 
   void disable_edges() { m_enabled_edges=false; }
   void enable_edges() { m_enabled_edges=true; }
   bool are_edges_enabled() const { return m_enabled_edges; }
+  void ignore_all_edges(bool b) { m_enabled_edges=!b; }
 
   void disable_faces() { m_enabled_faces=false; }
   void enable_faces() { m_enabled_faces=true; }
   bool are_faces_enabled() const { return m_enabled_faces; }
+  void ignore_all_faces(bool b) { m_enabled_faces=!b; }
 
 protected:
   bool m_enabled_vertices, m_enabled_edges, m_enabled_faces;
@@ -117,6 +120,7 @@ struct Graphics_scene_options:
   void disable_volumes() { m_enabled_volumes=false; }
   void enable_volumes() { m_enabled_volumes=true; }
   bool are_volumes_enabled() const { return m_enabled_volumes; }
+  void ignore_all_volumes(bool b) { m_enabled_volumes=!b; }
 
 protected:
   bool m_enabled_volumes;

diff --git a/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt b/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt
@@ -99,15 +99,10 @@ if(TARGET CGAL::Eigen3_support)
     point_set_shape_detection_plugin
     PRIVATE 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)
 

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
@@ -122,14 +122,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/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h b/Spatial_searching/doc/Spatial_searching/Concepts/SearchTraits.h
@@ -64,7 +64,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;
 
 /// @}