Skip to content

Commit

Permalink
more plugins depend on Eigen
Browse files Browse the repository at this point in the history
  • Loading branch information
afabri committed Oct 8, 2024
1 parent 59903f1 commit ad8ece6
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 9 deletions.
4 changes: 2 additions & 2 deletions Combinatorial_map/test/Combinatorial_map/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ create_single_source_cgal_program(Combinatorial_map_copy_test.cpp ${hfiles})
# Same targets, defining USE_COMPACT_CONTAINER_WITH_INDEX to test index version
add_executable(Combinatorial_map_test_index Combinatorial_map_test.cpp ${hfiles})
target_compile_definitions(Combinatorial_map_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX)
target_link_libraries(Combinatorial_map_test_index PUBLIC CGAL CGAL::Data)
target_link_libraries(Combinatorial_map_test_index PRIVATE CGAL::CGAL CGAL::Data)
cgal_add_compilation_test(Combinatorial_map_test_index)

add_executable(Combinatorial_map_copy_test_index Combinatorial_map_copy_test.cpp ${hfiles})
target_compile_definitions(Combinatorial_map_copy_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX)
target_link_libraries(Combinatorial_map_copy_test_index PUBLIC CGAL CGAL::Data)
target_link_libraries(Combinatorial_map_copy_test_index PRIVATE CGAL::CGAL CGAL::Data)
cgal_add_compilation_test(Combinatorial_map_copy_test_index)

create_single_source_cgal_program(cmap_test_split_attribute.cpp)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ if(Boost_FOUND)
foreach(target ${targets})
create_single_source_cgal_program("${target}.cpp")
if(TARGET ${target})
target_link_libraries(${target} PUBLIC ${project_linked_libraries} CGAL::Eigen3_support)
target_compile_definitions(${target} PUBLIC ${project_compilation_definitions})
target_link_libraries(${target} PRIVATE ${project_linked_libraries} CGAL::Eigen3_support)
target_compile_definitions(${target} PRIVATE ${project_compilation_definitions})
endif()
endforeach()
else()
Expand Down
3 changes: 2 additions & 1 deletion Lab/demo/Lab/Plugins/Display/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ 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)
scene_color_ramp
CGAL::Eigen3_support)

if(TARGET CGAL::Eigen3_support)
qt6_wrap_ui(heat_methodUI_FILES Heat_method.ui)
Expand Down
3 changes: 2 additions & 1 deletion Lab/demo/Lab/Plugins/PMP/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ cgal_lab_plugin(engrave_text_plugin Engrave_text_plugin
${engravUI_FILES})
target_link_libraries(
engrave_text_plugin PUBLIC scene_surface_mesh_item scene_selection_item
scene_polylines_item)
scene_polylines_item
CGAL::Eigen3_support)

if(CGAL_ENABLE_TESTING AND NOT CMAKE_VS_MSBUILD_COMMAND)
set_tests_properties(
Expand Down
2 changes: 1 addition & 1 deletion Lab/demo/Lab/Plugins/Point_set/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ cgal_lab_plugin(point_set_clustering_plugin Point_set_clustering_plugin
KEYWORDS PointSetProcessing)
target_link_libraries(
point_set_clustering_plugin PUBLIC scene_points_with_normal_item
scene_callback_signaler)
scene_callback_signaler CGAL::Eigen3_support)

cgal_lab_plugin(merge_point_sets_plugin Merge_point_sets_plugin KEYWORDS
PointSetProcessing Classification)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ if(NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910
find_package(LASLIB QUIET)
include(CGAL_LASLIB_support)
if (TARGET CGAL::LASLIB_support)
target_link_libraries(test_read_write_point_set PUBLIC ${CGAL_libs} CGAL::LASLIB_support)
target_link_libraries(test_deprecated_io_point_set PUBLIC ${CGAL_libs} CGAL::LASLIB_support)
target_link_libraries(test_read_write_point_set PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
target_link_libraries(test_deprecated_io_point_set PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
else()
message(STATUS "NOTICE: the LAS reader test requires LASlib and will not be compiled.")
endif()
Expand Down

0 comments on commit ad8ece6

Please sign in to comment.