fixes

CGAL · Oct 21, 2024 · 868e351 · 868e351
1 parent 439df74
commit 868e351
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 12 deletions.
diff --git a/Lab/demo/Lab/CMakeLists.txt b/Lab/demo/Lab/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_AUTOMOC ON)
 
 #Defines flags to emulate windows behavior for linking error generation
-if(CMAKE_CXX_COMPILER_ID EQUAL Clang
+if(CMAKE_CXX_COMPILER_ID STREQUAL Clang
    OR CMAKE_COMPILER_IS_GNUCC
    OR CMAKE_COMPILER_IS_GNUCXX)
   if(UNIX OR APPLE)
@@ -244,7 +244,10 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
 
   add_item(scene_c3t3_item Scene_c3t3_item.cpp)
   target_link_libraries(
-    scene_c3t3_item PRIVATE scene_triangulation_3_item
+    scene_c3t3_item
+    PUBLIC
+    scene_triangulation_3_item
+    PRIVATE
     scene_surface_mesh_item scene_polygon_soup_item
     scene_basic_objects ${TBB_LIBRARIES})
 
@@ -289,8 +292,11 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
   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 PRIVATE scene_item_decorator
-                                                     scene_k_ring_selection)
+  target_link_libraries(scene_selection_item
+    PUBLIC
+    scene_surface_mesh_item
+    scene_item_decorator
+    scene_k_ring_selection)
   if(TBB_FOUND)
     target_link_libraries(scene_selection_item PRIVATE CGAL::TBB_support)
   endif()

diff --git a/Lab/demo/Lab/Plugins/Convex_decomposition/CMakeLists.txt b/Lab/demo/Lab/Plugins/Convex_decomposition/CMakeLists.txt
@@ -1,4 +1,5 @@
 include(CGALlab_macros)
 
 cgal_lab_plugin(nef_plugin Nef_plugin)
-target_link_libraries(nef_plugin PRIVATE scene_nef_polyhedron_item)
+target_link_libraries(nef_plugin PRIVATE scene_nef_polyhedron_item scene_surface_mesh_item)
+
diff --git a/Lab/demo/Lab/Plugins/IO/CMakeLists.txt b/Lab/demo/Lab/Plugins/IO/CMakeLists.txt
@@ -59,8 +59,15 @@ target_link_libraries(triangulation_3_io_plugin PRIVATE scene_triangulation_3_it
 if(VTK_FOUND AND VTK_LIBRARIES)
   message(STATUS "VTK ${VTK_VERSION} found ${VTK_LIBRARIES}")
   cgal_lab_plugin(vtk_plugin VTK_io_plugin KEYWORDS Viewer Mesh_3)
-  target_link_libraries(vtk_plugin PRIVATE scene_surface_mesh_item scene_polylines_item scene_c3t3_item scene_points_with_normal_item
-                                    ${VTK_LIBRARIES})
+  target_link_libraries(vtk_plugin
+      PRIVATE
+      scene_surface_mesh_item
+      scene_polygon_soup_item
+      scene_polylines_item
+      scene_c3t3_item
+      scene_points_with_normal_item
+      ${VTK_LIBRARIES}
+  )
   target_compile_definitions(vtk_plugin  PRIVATE -DCGAL_USE_VTK -DNOMINMAX)
 else()
   message(STATUS "NOTICE: the vtk IO plugin needs VTK 9.0 or greater and will not be compiled.")

diff --git a/Lab/demo/Lab/Plugins/PCA/CMakeLists.txt b/Lab/demo/Lab/Plugins/PCA/CMakeLists.txt
@@ -9,6 +9,7 @@ qt6_wrap_ui(transformUI_FILES Transformation_widget.ui MeshOnGrid_dialog.ui)
 cgal_lab_plugin(affine_transform_plugin Affine_transform_plugin
                        ${transformUI_FILES} KEYWORDS PointSetProcessing)
 target_link_libraries(affine_transform_plugin PRIVATE scene_surface_mesh_item
+                                                      scene_polygon_soup_item
                                                       scene_points_with_normal_item
                                                       scene_aff_transformed_item
                                                       scene_aff_transformed_point_set_item

diff --git a/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt
@@ -112,7 +112,7 @@ target_link_libraries(polyhedron_stitching_plugin PRIVATE scene_surface_mesh_ite
 
 qt6_wrap_ui( selectionUI_FILES Selection_widget.ui)
 cgal_lab_plugin(selection_plugin Selection_plugin ${selectionUI_FILES} KEYWORDS PMP Viewer Classification Mesh_3)
-target_link_libraries(selection_plugin PRIVATE scene_selection_item scene_points_with_normal_item scene_polylines_item)
+target_link_libraries(selection_plugin PRIVATE scene_selection_item scene_surface_mesh_item scene_points_with_normal_item scene_polylines_item)
 
 #to keep it simple to compile
 add_custom_target(self_intersection_plugin)

diff --git a/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt b/Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt
@@ -205,7 +205,8 @@ qt6_wrap_ui(alpha_shapeUI_FILES Alpha_shape_widget.ui)
 cgal_lab_plugin(alpha_shape_plugin Alpha_shape_plugin
                        ${alpha_shapeUI_FILES} KEYWORDS PointSetProcessing)
 target_link_libraries(alpha_shape_plugin PRIVATE scene_points_with_normal_item
-                                                scene_c3t3_item)
+                                                 scene_polygon_soup_item
+                                                 scene_c3t3_item)
 
 qt6_wrap_ui(distanceUI_FILES Point_set_to_mesh_distance_widget.ui)
 cgal_lab_plugin(

diff --git a/Lab/demo/Lab/Plugins/Surface_mesh/CMakeLists.txt b/Lab/demo/Lab/Plugins/Surface_mesh/CMakeLists.txt
@@ -42,9 +42,12 @@ if(NOT CGAL_DISABLE_GMP)
   qt6_wrap_ui(shortestPathUI_FILES Shortest_path_widget.ui)
   cgal_lab_plugin(shortest_path_plugin Shortest_path_plugin
                          ${shortestPathUI_FILES})
-  target_link_libraries(
-    shortest_path_plugin PRIVATE scene_surface_mesh_item scene_shortest_path_item
-                                 scene_basic_objects)
+  target_link_libraries(shortest_path_plugin
+      PRIVATE
+      scene_surface_mesh_item
+      scene_selection_item
+      scene_shortest_path_item
+      scene_basic_objects)
 
   qt6_wrap_ui(basicUI_FILES Surface_mesh_approximation_dockwidget.ui)
   cgal_lab_plugin(