first batch of modifications during my review

[skip ci] (wait for the second batch of modifications)

Classification/examples/Classification/CMakeLists.txt

@@ -10,13 +10,15 @@ find_package(CGAL REQUIRED)
 set(Classification_dependencies_met TRUE)
 
 find_package(Boost OPTIONAL_COMPONENTS serialization iostreams)
+include(CGAL_Boost_serialization_support)
+include(CGAL_Boost_iostreams_support)
 
-if(NOT TARGET Boost::serialization)
+if(NOT TARGET CGAL::Boost_serialization_support)
   message("NOTICE: This project requires Boost Serialization, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
-if(NOT TARGET Boost::iostreams)
+if(NOT TARGET CGAL::Boost_iostreams_support)
   message("NOTICE: This project requires Boost IO Streams, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
@@ -67,8 +69,8 @@ foreach(target
     example_deprecated_conversion)
   if(TARGET ${target})
     target_link_libraries(${target} PRIVATE CGAL::Eigen3_support
-                                            Boost::iostreams
-                                            Boost::serialization)
+                                           CGAL::Boost_iostreams_support
+                                           CGAL::Boost_serialization_support)
     if(TARGET CGAL::TBB_support)
       target_link_libraries(${target} PRIVATE CGAL::TBB_support)
     endif()

Classification/test/Classification/CMakeLists.txt

@@ -10,13 +10,15 @@ find_package(CGAL REQUIRED)
 set(Classification_dependencies_met TRUE)
 
 find_package(Boost OPTIONAL_COMPONENTS serialization iostreams)
+include(CGAL_Boost_serialization_support)
+include(CGAL_Boost_iostreams_support)
 
-if(NOT TARGET Boost::serialization)
+if(NOT TARGET CGAL::Boost_serialization_support)
   message("NOTICE: This project requires Boost Serialization, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
 
-if(NOT TARGET Boost::iostreams)
+if(NOT TARGET CGAL::Boost_iostreams_support)
   message("NOTICE: This project requires Boost IO Streams, and will not be compiled.")
   set(Classification_dependencies_met FALSE)
 endif()
@@ -40,8 +42,8 @@ create_single_source_cgal_program("test_classification_io.cpp")
 
 foreach(target test_classification_point_set test_classification_io)
   target_link_libraries(${target} PRIVATE CGAL::Eigen3_support
-                                         Boost::iostreams
-                                         Boost::serialization)
+                                         CGAL::Boost_iostreams_support
+                                         CGAL::Boost_serialization_support)
   if(TARGET CGAL::TBB_support)
     target_link_libraries(${target} PRIVATE CGAL::TBB_support)
   endif()

Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake

@@ -23,10 +23,6 @@ function(create_single_source_cgal_program firstfile )
 
   if(EXISTS "${firstfile}")
 
-    if(CXX_FEATURES AND NOT COMMAND target_compile_features)
-      message(STATUS "NOTICE: ${exe_name}.cpp requires a CMake version >= 3.1 to detect C++ features, and will not be compiled.")
-      return()
-    endif()
     if(CXX_FEATURES)
       set(MISSING_CXX_FEATURES ${CXX_FEATURES})
       if(CMAKE_CXX_COMPILE_FEATURES)

Lab/demo/Lab/CMakeLists.txt

@@ -49,7 +49,6 @@ set_package_properties(
 
 if(Qt6_FOUND)
   add_compile_definitions(-DQT_NO_KEYWORDS)
-  add_compile_definitions(-DSCENE_IMAGE_GL_BUFFERS_AVAILABLE)
 endif(Qt6_FOUND)
 
 find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater)
@@ -186,10 +185,10 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
     Primitive_container.cpp
     CGALlab_plugin_helper.cpp
     CGAL_double_edit.cpp)
-  target_link_libraries(demo_framework PUBLIC Qt6::OpenGLWidgets Qt6::Widgets Qt6::Gui Qt6::Qml
-                                              CGAL::CGAL_Qt6)
+  target_link_libraries(demo_framework PRIVATE Qt6::OpenGLWidgets Qt6::Widgets Qt6::Gui
+                                       PUBLIC CGAL::CGAL_Qt6)
   if(TARGET Qt6::WebSockets)
-    target_link_libraries(demo_framework PUBLIC Qt6::WebSockets)
+    target_link_libraries(demo_framework PRIVATE Qt6::WebSockets)
     message(STATUS "Qt6WebSockets was found. Using WebSockets is therefore possible.")
   endif()
 
@@ -216,8 +215,8 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
   add_library(scene_basic_objects SHARED Scene_plane_item.cpp
                                          Scene_spheres_item.cpp)
   target_link_libraries(
-    scene_basic_objects PUBLIC demo_framework CGAL::CGAL_Qt6 Qt6::OpenGLWidgets
-                               Qt6::Gui Qt6::Widgets)
+    scene_basic_objects PRIVATE demo_framework CGAL::CGAL_Qt6 Qt6::OpenGLWidgets
+                                Qt6::Gui Qt6::Widgets)
   add_library(scene_color_ramp SHARED Color_ramp.cpp)
   target_link_libraries(scene_color_ramp PRIVATE Qt6::Core)
 
@@ -226,26 +225,26 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
   add_library(point_dialog SHARED Show_point_dialog.cpp Show_point_dialog.ui
                                   ${Show_point_dialogUI_FILES})
-  target_link_libraries(point_dialog PUBLIC Qt6::OpenGLWidgets Qt6::Gui
+  target_link_libraries(point_dialog PRIVATE Qt6::OpenGLWidgets Qt6::Gui
                                             Qt6::Widgets)
   cgal_add_compilation_test(point_dialog)
 
   macro(add_item item_name)
     add_library(${item_name} SHARED ${ARGN})
     target_link_libraries(
-      ${item_name} PUBLIC demo_framework CGAL::CGAL_Qt6 Qt6::OpenGLWidgets Qt6::Gui
-                          Qt6::Widgets)
+      ${item_name} PRIVATE demo_framework CGAL::CGAL_Qt6 Qt6::OpenGLWidgets Qt6::Gui
+                           Qt6::Widgets)
     cgal_add_compilation_test(${item_name})
     add_to_cached_list(CGAL_EXECUTABLE_TARGETS ${item_name})
     CGAL_install_hooks()
   endmacro(add_item)
 
   add_item(scene_triangulation_3_item Scene_triangulation_3_item.cpp)
-  target_link_libraries(scene_triangulation_3_item PUBLIC scene_basic_objects scene_edit_box_item)
+  target_link_libraries(scene_triangulation_3_item PRIVATE scene_basic_objects scene_edit_box_item)
 
   add_item(scene_c3t3_item Scene_c3t3_item.cpp)
   target_link_libraries(
-    scene_c3t3_item PUBLIC scene_triangulation_3_item
+    scene_c3t3_item PRIVATE scene_triangulation_3_item
     scene_surface_mesh_item scene_polygon_soup_item
     scene_basic_objects ${TBB_LIBRARIES})
 
@@ -258,19 +257,19 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
     target_precompile_headers(scene_c3t3_item PUBLIC [["C3t3_type.h"]])
   endif()
   add_item(scene_tetrahedra_item Scene_tetrahedra_item.cpp)
-  target_link_libraries(scene_tetrahedra_item PUBLIC scene_c3t3_item)
+  target_link_libraries(scene_tetrahedra_item PRIVATE scene_c3t3_item)
 
   add_item(scene_aff_transformed_item Plugins/PCA/Scene_aff_transformed_item.cpp)
 
   add_item(scene_aff_transformed_point_set_item Plugins/PCA/Scene_aff_transformed_point_set_item.cpp)
-  target_link_libraries(scene_aff_transformed_point_set_item PUBLIC scene_points_with_normal_item
-                                                                    scene_aff_transformed_item)
+  target_link_libraries(scene_aff_transformed_point_set_item PRIVATE scene_points_with_normal_item
+                                                                     scene_aff_transformed_item)
   add_item(scene_aff_transformed_polygon_soup_item Plugins/PCA/Scene_aff_transformed_polygon_soup_item.cpp)
-  target_link_libraries(scene_aff_transformed_polygon_soup_item PUBLIC scene_polygon_soup_item
-                                                                       scene_aff_transformed_item)
+  target_link_libraries(scene_aff_transformed_polygon_soup_item PRIVATE scene_polygon_soup_item
+                                                                        scene_aff_transformed_item)
   add_item(scene_aff_transformed_surface_mesh_item Plugins/PCA/Scene_aff_transformed_surface_mesh_item.cpp)
-  target_link_libraries(scene_aff_transformed_surface_mesh_item PUBLIC scene_surface_mesh_item
-                                                                       scene_aff_transformed_item)
+  target_link_libraries(scene_aff_transformed_surface_mesh_item PRIVATE scene_surface_mesh_item
+                                                                        scene_aff_transformed_item)
 
   add_item(scene_edit_box_item Plugins/PCA/Scene_edit_box_item.cpp)
 
@@ -283,15 +282,15 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
   # special
 
   add_item(scene_item_decorator Scene_polyhedron_item_decorator.cpp)
-  target_link_libraries(scene_item_decorator PUBLIC scene_surface_mesh_item)
+  target_link_libraries(scene_item_decorator PRIVATE scene_surface_mesh_item)
 
   add_item(scene_k_ring_selection
            Plugins/PMP/Scene_facegraph_item_k_ring_selection.cpp)
-  target_link_libraries(scene_k_ring_selection PUBLIC scene_surface_mesh_item)
+  target_link_libraries(scene_k_ring_selection PRIVATE scene_surface_mesh_item)
 
   add_item(scene_selection_item Scene_polyhedron_selection_item.cpp)
-  target_link_libraries(scene_selection_item PUBLIC scene_item_decorator
-                                                    scene_k_ring_selection)
+  target_link_libraries(scene_selection_item PRIVATE scene_item_decorator
+                                                     scene_k_ring_selection)
   if(TBB_FOUND)
     target_link_libraries(scene_selection_item PRIVATE CGAL::TBB_support)
   endif()
@@ -300,7 +299,7 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
            Plugins/Surface_mesh/Scene_polyhedron_shortest_path_item.cpp)
   target_link_libraries(
     scene_shortest_path_item
-    PUBLIC scene_item_decorator scene_surface_mesh_item scene_polylines_item)
+    PRIVATE scene_item_decorator scene_surface_mesh_item scene_polylines_item)
 
   add_item(scene_movable_sm_item Plugins/AABB_tree/Scene_movable_sm_item.cpp)
 
@@ -313,14 +312,14 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
   endif()
 
   add_item(scene_implicit_function_item Scene_implicit_function_item.cpp)
-  target_link_libraries(scene_implicit_function_item PUBLIC scene_color_ramp)
+  target_link_libraries(scene_implicit_function_item PRIVATE scene_color_ramp)
 
   add_item(scene_polygon_soup_item Scene_polygon_soup_item.cpp)
-  target_link_libraries(scene_polygon_soup_item PUBLIC scene_surface_mesh_item)
+  target_link_libraries(scene_polygon_soup_item PRIVATE scene_surface_mesh_item)
 
   add_item(scene_nef_polyhedron_item Scene_nef_polyhedron_item.cpp)
   target_link_libraries(scene_nef_polyhedron_item
-                        PUBLIC scene_surface_mesh_item)
+                        PRIVATE scene_surface_mesh_item)
 
   add_item(scene_points_with_normal_item Scene_points_with_normal_item.cpp)
   if(TARGET CGAL::Eigen3_support)
@@ -335,8 +334,8 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
   add_item(scene_polylines_item Scene_polylines_item.cpp)
   target_link_libraries(
-    scene_polylines_item PUBLIC scene_basic_objects
-                                scene_points_with_normal_item)
+    scene_polylines_item PRIVATE scene_basic_objects
+                                 scene_points_with_normal_item)
 
   add_item(scene_lcc_item Scene_lcc_item.cpp)
 
@@ -360,8 +359,9 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
     ${statisticsUI_FILES}
     ${SubViewerUI_files})
   target_link_libraries(
-    cgal_lab PUBLIC demo_framework point_dialog Qt6::Gui Qt6::OpenGLWidgets
-                           Qt6::Widgets )
+    cgal_lab PRIVATE demo_framework point_dialog Qt6::Widgets
+             PUBLIC Qt6::Gui Qt6::OpenGLWidgets Qt6::Qml
+                           )
   if(LIBSSH_FOUND)
     target_compile_definitions(cgal_lab PRIVATE -DCGAL_USE_SSH)
     target_link_libraries(cgal_lab PRIVATE ${LIBSSH_LIBRARIES})
@@ -420,7 +420,7 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
   #WS Server
   if(TARGET Qt6::WebSockets AND TARGET Qt6::Network)
     add_executable(WS_server Server_ws.cpp)
-    target_link_libraries(WS_server PUBLIC Qt6::WebSockets Qt6::Widgets Qt6::Network)
+    target_link_libraries(WS_server PRIVATE Qt6::WebSockets Qt6::Widgets Qt6::Network)
     message(STATUS "Qt6WebSockets was found. Using WebSockets is therefore possible.")
   endif()
   #

Lab/demo/Lab/Plugins/AABB_tree/CMakeLists.txt

@@ -1,11 +1,11 @@
 include(CGALlab_macros)
 
 cgal_lab_plugin(do_trees_intersect_plugin Do_trees_intersect_plugin)
-target_link_libraries(do_trees_intersect_plugin PUBLIC scene_surface_mesh_item
+target_link_libraries(do_trees_intersect_plugin PRIVATE scene_surface_mesh_item
                                                        scene_movable_sm_item)
 
 cgal_lab_plugin(cut_plugin Cut_plugin)
-target_link_libraries(cut_plugin PUBLIC scene_surface_mesh_item
+target_link_libraries(cut_plugin PRIVATE scene_surface_mesh_item
                                         scene_basic_objects scene_color_ramp)
 if(TARGET CGAL::TBB_support)
   target_link_libraries(cut_plugin PRIVATE CGAL::TBB_support)

Lab/demo/Lab/Plugins/Alpha_wrap_3/CMakeLists.txt

@@ -5,4 +5,4 @@ qt6_wrap_ui(alpha_wrap_3UI_FILES alpha_wrap_3_dialog.ui)
 cgal_lab_plugin(alpha_wrap_3_plugin Alpha_wrap_3_plugin ${alpha_wrap_3UI_FILES})
 
 #if the plugin uses external libraries like scene_items
-target_link_libraries(alpha_wrap_3_plugin PUBLIC scene_surface_mesh_item scene_polygon_soup_item scene_points_with_normal_item scene_selection_item scene_polylines_item)
+target_link_libraries(alpha_wrap_3_plugin PRIVATE scene_surface_mesh_item scene_polygon_soup_item scene_points_with_normal_item scene_selection_item scene_polylines_item)

Lab/demo/Lab/Plugins/Camera_position/CMakeLists.txt

@@ -8,4 +8,4 @@ cgal_lab_plugin(camera_positions_plugin
     KEYWORDS Viewer)
 
 add_dependencies(camera_positions_plugin demo_framework)
-target_link_libraries(camera_positions_plugin PUBLIC demo_framework)
+target_link_libraries(camera_positions_plugin PRIVATE demo_framework)

Lab/demo/Lab/Plugins/Classification/CMakeLists.txt

@@ -3,8 +3,9 @@ include(CGALlab_macros)
 if(TARGET CGAL::Eigen3_support)
 
   find_package(Boost QUIET OPTIONAL_COMPONENTS serialization iostreams)
-
-  if(NOT TARGET Boost::serialization OR NOT TARGET Boost::iostreams)
+  include(CGAL_Boost_serialization_support)
+  include(CGAL_Boost_iostreams_support)
+  if(NOT TARGET CGAL::Boost_serialization_support OR NOT TARGET CGAL::Boost_iostreams_support)
     message(STATUS "NOTICE: Boost IO Streams and/or Serialization not found, reading deprecated Classification config files won't be possible.")
   endif()
 
@@ -32,7 +33,7 @@ if(TARGET CGAL::Eigen3_support)
     Classification)
   target_link_libraries(
     classification_plugin
-    PUBLIC scene_points_with_normal_item
+    PRIVATE scene_points_with_normal_item
     scene_polylines_item
     scene_polygon_soup_item
     scene_surface_mesh_item
@@ -46,9 +47,9 @@ if(TARGET CGAL::Eigen3_support)
         PROPERTIES RESOURCE_LOCK Selection_test_resources)
     endif()
 
-  if(TARGET Boost::serialization AND TARGET Boost::iostreams)
-    target_link_libraries(classification_plugin PRIVATE Boost::serialization
-                                                        Boost::iostreams)
+  if(TARGET CGAL::Boost_serialization_support AND TARGET CGAL::Boost_iostreams_support)
+    target_link_libraries(classification_plugin PRIVATE CGAL::Boost_serialization_support
+                                                       CGAL::Boost_iostreams_support)
   endif()
 
   if(TARGET CGAL::OpenCV_support)

Lab/demo/Lab/Plugins/Convex_decomposition/CMakeLists.txt

@@ -1,4 +1,4 @@
 include(CGALlab_macros)
 
 cgal_lab_plugin(nef_plugin Nef_plugin)
-target_link_libraries(nef_plugin PUBLIC scene_nef_polyhedron_item)
+target_link_libraries(nef_plugin PRIVATE scene_nef_polyhedron_item)

Lab/demo/Lab/Plugins/Convex_hull/CMakeLists.txt

@@ -3,11 +3,11 @@ include(CGALlab_macros)
 cgal_lab_plugin(convex_hull_plugin Convex_hull_plugin KEYWORDS
                        PointSetProcessing)
 target_link_libraries(
-  convex_hull_plugin PUBLIC scene_points_with_normal_item scene_polylines_item
+  convex_hull_plugin PRIVATE scene_points_with_normal_item scene_polylines_item
                             scene_selection_item scene_surface_mesh_item)
 
 cgal_lab_plugin(kernel_plugin Kernel_plugin)
-target_link_libraries(kernel_plugin PUBLIC scene_surface_mesh_item)
+target_link_libraries(kernel_plugin PRIVATE scene_surface_mesh_item)
 
 
 if(CGAL_ENABLE_TESTING AND NOT CMAKE_VS_MSBUILD_COMMAND)

Lab/demo/Lab/Plugins/Display/CMakeLists.txt

@@ -2,16 +2,16 @@ include(CGALlab_macros)
 
 qt6_wrap_ui(display_propertyUI_FILES Display_property.ui)
 cgal_lab_plugin(display_property_plugin Display_property_plugin ${display_propertyUI_FILES} KEYWORDS Viewer)
-target_link_libraries(display_property_plugin PUBLIC scene_surface_mesh_item
-                                                     scene_points_with_normal_item
-                                                     scene_color_ramp
-                                                     CGAL::Eigen3_support)
+target_link_libraries(display_property_plugin PRIVATE scene_surface_mesh_item
+                                                      scene_points_with_normal_item
+                                                      scene_color_ramp
+                                                      CGAL::Eigen3_support)
 
 if(TARGET CGAL::Eigen3_support)
   qt6_wrap_ui(heat_methodUI_FILES Heat_method.ui)
   cgal_lab_plugin(heat_method_plugin Heat_method_plugin ${heat_methodUI_FILES} KEYWORDS Viewer)
-  target_link_libraries(heat_method_plugin PUBLIC scene_surface_mesh_item
-                                                  scene_selection_item
-                                                  scene_color_ramp
-                                                  CGAL::Eigen3_support)
+  target_link_libraries(heat_method_plugin PRIVATE scene_surface_mesh_item
+                                                   scene_selection_item
+                                                   scene_color_ramp
+                                                   CGAL::Eigen3_support)
 endif()