diff --git a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt index 1d4deb97575..ee0ce933435 100644 --- a/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt @@ -1,9 +1,7 @@ # Created by the script cgal_create_cmake_script. # This is the CMake script for compiling a CGAL application. - -project(Barycentric_coordinates_2_Benchmarks) - cmake_minimum_required(VERSION 3.12...3.31) +project(Barycentric_coordinates_2_Benchmarks) find_package(CGAL REQUIRED COMPONENTS Core) @@ -14,8 +12,9 @@ create_single_source_cgal_program("benchmark_polygon_16_vertices.cpp") create_single_source_cgal_program("benchmark_polygon_100_vertices.cpp") create_single_source_cgal_program("benchmark_mv_34_vertices.cpp") -find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("benchmark_hm_4_vertices.cpp") target_link_libraries(benchmark_hm_4_vertices PRIVATE CGAL::Eigen3_support) diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt index 43a49733d1a..fc4c0fc9855 100644 --- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt @@ -17,8 +17,9 @@ create_single_source_cgal_program("terrain_height_modeling.cpp") # this code is deprecated: create_single_source_cgal_program("deprecated_coordinates.cpp") -find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("affine_coordinates.cpp") target_link_libraries(affine_coordinates PRIVATE CGAL::Eigen3_support) diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt index 7b01647d5c1..d2c746054e6 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt @@ -42,8 +42,9 @@ create_single_source_cgal_program("test_wp_deprecated_api.cpp") create_single_source_cgal_program("test_mv_deprecated_api.cpp") create_single_source_cgal_program("test_dh_deprecated_api.cpp") -find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("test_hm_unit_square.cpp") target_link_libraries(test_hm_unit_square PRIVATE CGAL::Eigen3_support) diff --git a/Basic_viewer/examples/Basic_viewer/CMakeLists.txt b/Basic_viewer/examples/Basic_viewer/CMakeLists.txt index e6aa5faba8a..e6f3f1ea843 100644 --- a/Basic_viewer/examples/Basic_viewer/CMakeLists.txt +++ b/Basic_viewer/examples/Basic_viewer/CMakeLists.txt @@ -11,7 +11,7 @@ project(Basic_viewer_Examples) #CGAL_Qt6 is needed for the drawing. find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) -find_package(Eigen3 3.1.0) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) create_single_source_cgal_program("draw_lcc.cpp") diff --git a/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt b/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt index 1829009c9c0..13a7aa44cb6 100644 --- a/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt +++ b/Bounding_volumes/examples/Approximate_min_ellipsoid_d/CMakeLists.txt @@ -4,7 +4,7 @@ project(Approximate_min_ellipsoid_d_Examples) find_package(CGAL REQUIRED) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) # create a target per cppfile diff --git a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt index 143e296e6ff..0fa06ce46a7 100644 --- a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt +++ b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt @@ -7,7 +7,7 @@ project(Bounding_volumes_Tests) find_package(CGAL REQUIRED COMPONENTS Core) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) # create a target per cppfile diff --git a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt index a27008458d1..22d0800b2dd 100644 --- a/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt +++ b/CGAL_ipelets/demo/CGAL_ipelets/CMakeLists.txt @@ -20,8 +20,9 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}") find_package(CGAL REQUIRED COMPONENTS Core) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Classification/examples/Classification/CMakeLists.txt b/Classification/examples/Classification/CMakeLists.txt index e9e93a6d3a6..e1f88ede7fa 100644 --- a/Classification/examples/Classification/CMakeLists.txt +++ b/Classification/examples/Classification/CMakeLists.txt @@ -23,8 +23,9 @@ if(NOT TARGET CGAL::Boost_iostreams_support) set(Classification_dependencies_met FALSE) endif() -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") set(Classification_dependencies_met FALSE) diff --git a/Classification/test/Classification/CMakeLists.txt b/Classification/test/Classification/CMakeLists.txt index 0135ea6f175..48848dfdc5f 100644 --- a/Classification/test/Classification/CMakeLists.txt +++ b/Classification/test/Classification/CMakeLists.txt @@ -23,8 +23,9 @@ if(NOT TARGET CGAL::Boost_iostreams_support) set(Classification_dependencies_met FALSE) endif() -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") set(Classification_dependencies_met FALSE) diff --git a/Frechet_distance/examples/Frechet_distance/CMakeLists.txt b/Frechet_distance/examples/Frechet_distance/CMakeLists.txt index 18f9c3fa6bf..8ecf0d59a08 100644 --- a/Frechet_distance/examples/Frechet_distance/CMakeLists.txt +++ b/Frechet_distance/examples/Frechet_distance/CMakeLists.txt @@ -7,7 +7,7 @@ project( Frechet_distance_Examples ) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core ) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) create_single_source_cgal_program( "Frechet_distance_2.cpp" ) diff --git a/Frechet_distance/test/Frechet_distance/CMakeLists.txt b/Frechet_distance/test/Frechet_distance/CMakeLists.txt index fdf7fc6d1a6..545906769f0 100644 --- a/Frechet_distance/test/Frechet_distance/CMakeLists.txt +++ b/Frechet_distance/test/Frechet_distance/CMakeLists.txt @@ -6,11 +6,12 @@ project( Frechet_distance_Tests ) find_package(CGAL REQUIRED) +find_package(Eigen3 QUIET) + +include(CGAL_Eigen3_support) create_single_source_cgal_program( "Frechet-IssueOct25.cpp" ) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) -include(CGAL_Eigen3_support) if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program( "Frechet_distance_test.cpp" ) target_link_libraries(Frechet_distance_test PRIVATE CGAL::Eigen3_support) diff --git a/Frechet_distance/test/Frechet_distance/data/scripts/CMakeLists.txt b/Frechet_distance/test/Frechet_distance/data/scripts/CMakeLists.txt index efef6b885ee..51b38dabc49 100644 --- a/Frechet_distance/test/Frechet_distance/data/scripts/CMakeLists.txt +++ b/Frechet_distance/test/Frechet_distance/data/scripts/CMakeLists.txt @@ -6,8 +6,7 @@ project( classical_Frechet_distance ) find_package(CGAL REQUIRED) - -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) create_single_source_cgal_program("Compute_classical_Frechet_distance_3.cpp") diff --git a/Generator/examples/Generator/CMakeLists.txt b/Generator/examples/Generator/CMakeLists.txt index 0575929b894..e9e78e0bfa4 100644 --- a/Generator/examples/Generator/CMakeLists.txt +++ b/Generator/examples/Generator/CMakeLists.txt @@ -28,8 +28,9 @@ create_single_source_cgal_program("random_segments1.cpp") create_single_source_cgal_program("random_segments2.cpp") create_single_source_cgal_program("sphere_d.cpp") -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("random_points_in_tetrahedral_mesh_3.cpp") target_link_libraries(random_points_in_tetrahedral_mesh_3 PRIVATE CGAL::Eigen3_support) diff --git a/Generator/test/Generator/CMakeLists.txt b/Generator/test/Generator/CMakeLists.txt index 060c4b02905..d93118adfda 100644 --- a/Generator/test/Generator/CMakeLists.txt +++ b/Generator/test/Generator/CMakeLists.txt @@ -15,8 +15,9 @@ create_single_source_cgal_program("test_tetrahedron_3.cpp") create_single_source_cgal_program("test_triangle_2.cpp") create_single_source_cgal_program("test_triangle_3.cpp") -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("generic_random_test.cpp") target_link_libraries(generic_random_test PRIVATE CGAL::Eigen3_support) diff --git a/GraphicsView/demo/Bounding_volumes/CMakeLists.txt b/GraphicsView/demo/Bounding_volumes/CMakeLists.txt index a28575fd8a7..20d60452383 100644 --- a/GraphicsView/demo/Bounding_volumes/CMakeLists.txt +++ b/GraphicsView/demo/Bounding_volumes/CMakeLists.txt @@ -8,7 +8,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) find_package(Qt6 QUIET COMPONENTS Widgets) -find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) if(NOT TARGET CGAL::Eigen3_support) diff --git a/GraphicsView/demo/Polygon/CMakeLists.txt b/GraphicsView/demo/Polygon/CMakeLists.txt index eb899f59ba3..dca7d6c16ab 100644 --- a/GraphicsView/demo/Polygon/CMakeLists.txt +++ b/GraphicsView/demo/Polygon/CMakeLists.txt @@ -6,8 +6,9 @@ project(Polygon_Demo) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6 Core) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This demo requires the Eigen library, and will not be compiled.") return() diff --git a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt index 8bc9d360ca3..4dfea9ee0ef 100644 --- a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt @@ -7,8 +7,9 @@ project(Heat_method_3_Examples) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.3.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: These examples require the Eigen library (3.3 or greater), and will not be compiled.") return() diff --git a/Heat_method_3/test/Heat_method_3/CMakeLists.txt b/Heat_method_3/test/Heat_method_3/CMakeLists.txt index f8b3f13f0b1..b84445715f4 100644 --- a/Heat_method_3/test/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/test/Heat_method_3/CMakeLists.txt @@ -7,8 +7,9 @@ project(Heat_method_3_Tests) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.3.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: These tests require the Eigen library (3.3 or greater), and will not be compiled.") return() diff --git a/Installation/cmake/modules/CGAL_Eigen3_support.cmake b/Installation/cmake/modules/CGAL_Eigen3_support.cmake index bfcf56c7c2f..3296052dc26 100644 --- a/Installation/cmake/modules/CGAL_Eigen3_support.cmake +++ b/Installation/cmake/modules/CGAL_Eigen3_support.cmake @@ -1,3 +1,10 @@ +if((EIGEN3_FOUND OR Eigen3_FOUND) AND NOT TARGET CGAL::Eigen3_support) + if ("${Eigen3_VERSION}" VERSION_LESS "3.3.7") + set (EIGEN3_FOUND 0) + find_package(Eigen3 3.3.7 QUIET) # (3.3.7 or greater) + endif() +endif() + if((EIGEN3_FOUND OR Eigen3_FOUND) AND NOT TARGET CGAL::Eigen3_support) if(NOT TARGET Threads::Threads) find_package(Threads REQUIRED) diff --git a/Isosurfacing_3/benchmark/Isosurfacing_3/CMakeLists.txt b/Isosurfacing_3/benchmark/Isosurfacing_3/CMakeLists.txt index b1ecd2b02d3..34f3bff1ad6 100644 --- a/Isosurfacing_3/benchmark/Isosurfacing_3/CMakeLists.txt +++ b/Isosurfacing_3/benchmark/Isosurfacing_3/CMakeLists.txt @@ -6,7 +6,7 @@ project( Isosurfacing_3_benchmark ) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) find_package(TBB) diff --git a/Isosurfacing_3/examples/Isosurfacing_3/CMakeLists.txt b/Isosurfacing_3/examples/Isosurfacing_3/CMakeLists.txt index 33d73873145..6181c212406 100644 --- a/Isosurfacing_3/examples/Isosurfacing_3/CMakeLists.txt +++ b/Isosurfacing_3/examples/Isosurfacing_3/CMakeLists.txt @@ -6,7 +6,7 @@ project( Isosurfacing_3_Examples ) find_package(CGAL REQUIRED COMPONENTS ImageIO) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) find_package(TBB QUIET) diff --git a/Isosurfacing_3/test/Isosurfacing_3/CMakeLists.txt b/Isosurfacing_3/test/Isosurfacing_3/CMakeLists.txt index c1d821264e6..1525788821a 100644 --- a/Isosurfacing_3/test/Isosurfacing_3/CMakeLists.txt +++ b/Isosurfacing_3/test/Isosurfacing_3/CMakeLists.txt @@ -4,7 +4,7 @@ project(Isosurfacing_3_Tests) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) find_package(TBB QUIET) diff --git a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt index abb85906be2..071ea121520 100644 --- a/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/examples/Jet_fitting_3/CMakeLists.txt @@ -7,8 +7,9 @@ project(Jet_fitting_3_Examples) find_package(CGAL REQUIRED) # use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) # Link with Boost.ProgramOptions (optional) diff --git a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt index 62b395e1d4b..d53248855b8 100644 --- a/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt +++ b/Jet_fitting_3/test/Jet_fitting_3/CMakeLists.txt @@ -7,8 +7,9 @@ project(Jet_fitting_3_Tests) find_package(CGAL REQUIRED) # use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("blind_1pt.cpp") target_link_libraries(blind_1pt PRIVATE CGAL::Eigen3_support) diff --git a/Kinetic_space_partition/examples/Kinetic_space_partition/CMakeLists.txt b/Kinetic_space_partition/examples/Kinetic_space_partition/CMakeLists.txt index 17b245ff4b0..3907cfd88f8 100644 --- a/Kinetic_space_partition/examples/Kinetic_space_partition/CMakeLists.txt +++ b/Kinetic_space_partition/examples/Kinetic_space_partition/CMakeLists.txt @@ -8,7 +8,7 @@ project(Kinetic_space_partition_Examples) find_package(CGAL REQUIRED) include(CGAL_CreateSingleSourceCGALProgram) -find_package(Eigen3 3.1.0 REQUIRED) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) if(TARGET CGAL::Eigen3_support) diff --git a/Kinetic_space_partition/test/Kinetic_space_partition/CMakeLists.txt b/Kinetic_space_partition/test/Kinetic_space_partition/CMakeLists.txt index 5ec3fd2e57e..7da6df244cb 100644 --- a/Kinetic_space_partition/test/Kinetic_space_partition/CMakeLists.txt +++ b/Kinetic_space_partition/test/Kinetic_space_partition/CMakeLists.txt @@ -8,7 +8,7 @@ project(Kinetic_space_partition_Tests) find_package(CGAL REQUIRED) include(CGAL_CreateSingleSourceCGALProgram) -find_package(Eigen3 3.1.0 REQUIRED) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) set(targets kinetic_3d_test_all issue_8624) diff --git a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/CMakeLists.txt b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/CMakeLists.txt index 87ebb0d4c47..44afa326119 100644 --- a/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/CMakeLists.txt +++ b/Kinetic_surface_reconstruction/examples/Kinetic_surface_reconstruction/CMakeLists.txt @@ -8,7 +8,7 @@ project(Kinetic_surface_reconstruction_Examples) find_package(CGAL REQUIRED) include(CGAL_CreateSingleSourceCGALProgram) -find_package(Eigen3 3.1.0 REQUIRED) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) if(TARGET CGAL::Eigen3_support) diff --git a/Kinetic_surface_reconstruction/test/Kinetic_surface_reconstruction/CMakeLists.txt b/Kinetic_surface_reconstruction/test/Kinetic_surface_reconstruction/CMakeLists.txt index 9fed8e80389..35c740fd889 100644 --- a/Kinetic_surface_reconstruction/test/Kinetic_surface_reconstruction/CMakeLists.txt +++ b/Kinetic_surface_reconstruction/test/Kinetic_surface_reconstruction/CMakeLists.txt @@ -8,7 +8,7 @@ project(Kinetic_surface_reconstruction_Tests) find_package(CGAL REQUIRED) include(CGAL_CreateSingleSourceCGALProgram) -find_package(Eigen3 3.1.0 REQUIRED) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) if(TARGET CGAL::Eigen3_support) diff --git a/Lab/demo/Lab/CMakeLists.txt b/Lab/demo/Lab/CMakeLists.txt index 3955f6247f4..a877d890c1e 100644 --- a/Lab/demo/Lab/CMakeLists.txt +++ b/Lab/demo/Lab/CMakeLists.txt @@ -51,12 +51,14 @@ if(Qt6_FOUND) add_compile_definitions(QT_NO_KEYWORDS) endif(Qt6_FOUND) -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) +include(CGAL_Eigen3_support) + set_package_properties( Eigen3 PROPERTIES DESCRIPTION "A library for linear algebra." PURPOSE "Required for most plugins (Meshing, Mesh and Point Set Processing, etc.).") -include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message(STATUS "NOTICE: Eigen was not found.") endif() diff --git a/Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt b/Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt index 7a0275e552d..35680e5a907 100644 --- a/Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Mesh_3/CMakeLists.txt @@ -78,8 +78,9 @@ target_link_libraries( CGAL_Lab_target_use_c3t3_type(mesh_3_optimization_plugin) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) target_link_libraries(mesh_3_optimization_plugin PRIVATE CGAL::Eigen3_support) else() diff --git a/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt index d953147df3d..212bcc0cc44 100644 --- a/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/PMP/CMakeLists.txt @@ -28,61 +28,57 @@ target_link_libraries(extrude_plugin PRIVATE scene_surface_mesh_item scene_selection_item) if(TARGET CGAL::Eigen3_support) - if("${Eigen3_VERSION}" VERSION_GREATER "3.1.90") - qt6_wrap_ui( acvd_remeshingUI_FILES ACVD_remeshing_dialog.ui) - cgal_lab_plugin(acvd_remeshing_plugin ACVD_remeshing_plugin ${acvd_remeshingUI_FILES} KEYWORDS PMP) - target_link_libraries(acvd_remeshing_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item scene_polygon_soup_item CGAL::Eigen3_support) + qt6_wrap_ui( acvd_remeshingUI_FILES ACVD_remeshing_dialog.ui) + cgal_lab_plugin(acvd_remeshing_plugin ACVD_remeshing_plugin ${acvd_remeshingUI_FILES} KEYWORDS PMP) + target_link_libraries(acvd_remeshing_plugin PUBLIC scene_surface_mesh_item scene_points_with_normal_item scene_polygon_soup_item CGAL::Eigen3_support) - qt6_wrap_ui( hole_fillingUI_FILES Hole_filling_widget.ui) - cgal_lab_plugin(hole_filling_plugin Hole_filling_plugin ${hole_fillingUI_FILES} KEYWORDS PMP) - target_link_libraries(hole_filling_plugin PRIVATE scene_surface_mesh_item scene_polylines_item scene_selection_item CGAL::Eigen3_support) + qt6_wrap_ui( hole_fillingUI_FILES Hole_filling_widget.ui) + cgal_lab_plugin(hole_filling_plugin Hole_filling_plugin ${hole_fillingUI_FILES} KEYWORDS PMP) + target_link_libraries(hole_filling_plugin PRIVATE scene_surface_mesh_item scene_polylines_item scene_selection_item CGAL::Eigen3_support) - qt6_wrap_ui( fairingUI_FILES Fairing_widget.ui) - cgal_lab_plugin(fairing_plugin Fairing_plugin ${fairingUI_FILES} KEYWORDS PMP) - target_link_libraries(fairing_plugin PRIVATE scene_selection_item CGAL::Eigen3_support) + qt6_wrap_ui( fairingUI_FILES Fairing_widget.ui) + cgal_lab_plugin(fairing_plugin Fairing_plugin ${fairingUI_FILES} KEYWORDS PMP) + target_link_libraries(fairing_plugin PRIVATE scene_selection_item CGAL::Eigen3_support) - qt6_wrap_ui( Mean_curvature_flow_skeleton_pluginUI_FILES Mean_curvature_flow_skeleton_plugin.ui) - cgal_lab_plugin(mean_curvature_flow_skeleton_plugin Mean_curvature_flow_skeleton_plugin ${Mean_curvature_flow_skeleton_pluginUI_FILES}) - target_link_libraries(mean_curvature_flow_skeleton_plugin - PRIVATE - scene_surface_mesh_item - scene_points_with_normal_item - scene_polylines_item - scene_mcf_item - demo_framework - CGAL::Eigen3_support) - # The smoothing plugin can still do some things, even if Ceres is not found - qt6_wrap_ui( smoothingUI_FILES Smoothing_plugin.ui Smoothing_tangential_relaxation.ui) - cgal_lab_plugin(smoothing_plugin Smoothing_plugin ${smoothingUI_FILES}) - target_link_libraries(smoothing_plugin PRIVATE scene_surface_mesh_item scene_selection_item CGAL::Eigen3_support) - find_package(Ceres QUIET) - include(CGAL_Ceres_support) - if(TARGET CGAL::Ceres_support) - target_link_libraries(smoothing_plugin PRIVATE CGAL::Ceres_support) - endif() + qt6_wrap_ui( Mean_curvature_flow_skeleton_pluginUI_FILES Mean_curvature_flow_skeleton_plugin.ui) + cgal_lab_plugin(mean_curvature_flow_skeleton_plugin Mean_curvature_flow_skeleton_plugin ${Mean_curvature_flow_skeleton_pluginUI_FILES}) + target_link_libraries(mean_curvature_flow_skeleton_plugin + PRIVATE + scene_surface_mesh_item + scene_points_with_normal_item + scene_polylines_item + scene_mcf_item + demo_framework + CGAL::Eigen3_support) + # The smoothing plugin can still do some things, even if Ceres is not found + qt6_wrap_ui( smoothingUI_FILES Smoothing_plugin.ui Smoothing_tangential_relaxation.ui) + cgal_lab_plugin(smoothing_plugin Smoothing_plugin ${smoothingUI_FILES}) + target_link_libraries(smoothing_plugin PRIVATE scene_surface_mesh_item scene_selection_item CGAL::Eigen3_support) + find_package(Ceres QUIET) + include(CGAL_Ceres_support) + if(TARGET CGAL::Ceres_support) + target_link_libraries(smoothing_plugin PRIVATE CGAL::Ceres_support) + endif() - set_package_properties( - Ceres PROPERTIES - DESCRIPTION "A large scale non-linear optimization library." - PURPOSE "Can be used as a solver in the smoothing plugin.") - target_link_libraries(extrude_plugin PRIVATE CGAL::Eigen3_support) + set_package_properties( + Ceres PROPERTIES + DESCRIPTION "A large scale non-linear optimization library." + PURPOSE "Can be used as a solver in the smoothing plugin.") + target_link_libraries(extrude_plugin PRIVATE CGAL::Eigen3_support) - qt6_wrap_ui(remeshPlanarPatchesUI_FILES Remesh_planar_patches_dialog.ui) - cgal_lab_plugin(remesh_planar_patches_plugin Remesh_planar_patches_plugin - ${remeshPlanarPatchesUI_FILES} KEYWORDS PMP CDT_3) - target_link_libraries(remesh_planar_patches_plugin PRIVATE scene_surface_mesh_item CGAL::Eigen3_support) + qt6_wrap_ui(remeshPlanarPatchesUI_FILES Remesh_planar_patches_dialog.ui) + cgal_lab_plugin(remesh_planar_patches_plugin Remesh_planar_patches_plugin + ${remeshPlanarPatchesUI_FILES} KEYWORDS PMP CDT_3) + target_link_libraries(remesh_planar_patches_plugin PRIVATE scene_surface_mesh_item CGAL::Eigen3_support) - if(CGAL_ENABLE_TESTING AND NOT CMAKE_VS_MSBUILD_COMMAND) - set_tests_properties( - "compilation of extrude_plugin" - "compilation of fairing_plugin" - "compilation of hole_filling_plugin" - "compilation of remesh_planar_patches_plugin" - "compilation of smoothing_plugin" - PROPERTIES RESOURCE_LOCK Selection_test_resources) - endif() - else() - message(STATUS "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available.") + if(CGAL_ENABLE_TESTING AND NOT CMAKE_VS_MSBUILD_COMMAND) + set_tests_properties( + "compilation of extrude_plugin" + "compilation of fairing_plugin" + "compilation of hole_filling_plugin" + "compilation of remesh_planar_patches_plugin" + "compilation of smoothing_plugin" + PROPERTIES RESOURCE_LOCK Selection_test_resources) endif() else() message(STATUS "NOTICE: The hole filling and fairing plugins require Eigen 3.2 (or higher) and will not be available.") diff --git a/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt index 397690a85a3..c467184d031 100644 --- a/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Surface_mesh_deformation/CMakeLists.txt @@ -1,6 +1,6 @@ include(CGALlab_macros) -if(TARGET CGAL::Eigen3_support AND "${Eigen3_VERSION}" VERSION_GREATER "3.1.90") +if(TARGET CGAL::Eigen3_support) qt6_wrap_ui(editionUI_FILES Deform_mesh.ui) add_item(scene_edit_item diff --git a/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt index 0ed23d73d3a..2eeef206b12 100644 --- a/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt +++ b/Lab/demo/Lab/Plugins/Tetrahedral_remeshing/CMakeLists.txt @@ -14,7 +14,7 @@ cgal_lab_plugin( target_link_libraries(tetrahedral_remeshing_plugin PRIVATE scene_c3t3_item ${OPENGL_gl_LIBRARY}) CGAL_Lab_target_use_c3t3_type(tetrahedral_remeshing_plugin) -find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) if(TARGET CGAL::Eigen3_support) target_link_libraries(tetrahedral_remeshing_plugin PRIVATE CGAL::Eigen3_support) diff --git a/Mesh_3/examples/Mesh_3/CMakeLists.txt b/Mesh_3/examples/Mesh_3/CMakeLists.txt index 3a36d74eb05..151ba89cf10 100644 --- a/Mesh_3/examples/Mesh_3/CMakeLists.txt +++ b/Mesh_3/examples/Mesh_3/CMakeLists.txt @@ -19,8 +19,9 @@ if(CGAL_ACTIVATE_CONCURRENT_MESH_3 OR "$ENV{CGAL_ACTIVATE_CONCURRENT_MESH_3}") endif() # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: All examples require the Eigen3 library, and will not be compiled.") return() diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt index 012f67c8f75..ab2a8ab66ec 100644 --- a/Mesh_3/test/Mesh_3/CMakeLists.txt +++ b/Mesh_3/test/Mesh_3/CMakeLists.txt @@ -7,8 +7,9 @@ project( Mesh_3_Tests ) find_package(CGAL REQUIRED COMPONENTS ImageIO) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if (NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/NewKernel_d/test/NewKernel_d/CMakeLists.txt b/NewKernel_d/test/NewKernel_d/CMakeLists.txt index aa9bf6f75f5..2e2daf1b642 100644 --- a/NewKernel_d/test/NewKernel_d/CMakeLists.txt +++ b/NewKernel_d/test/NewKernel_d/CMakeLists.txt @@ -14,6 +14,7 @@ find_package(CGAL REQUIRED) find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) file( GLOB cppfiles diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt index 2866af70bbf..de674e51c93 100644 --- a/Number_types/test/Number_types/CMakeLists.txt +++ b/Number_types/test/Number_types/CMakeLists.txt @@ -80,8 +80,10 @@ if(NOT CGAL_DISABLE_GMP) create_single_source_cgal_program( "Gmpfi.cpp" ) create_single_source_cgal_program( "Gmpfr_bug.cpp" ) create_single_source_cgal_program( "test_eigen.cpp" ) - find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) + + find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if (TARGET CGAL::Eigen3_support) target_link_libraries(test_eigen PRIVATE CGAL::Eigen3_support) endif() diff --git a/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt index dbff84b5cf6..8782353f90a 100644 --- a/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/benchmark/Optimal_bounding_box/CMakeLists.txt @@ -7,8 +7,9 @@ project(Optimal_bounding_box_Benchmark) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt index 5e9acc6a48d..1be8b44430f 100644 --- a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt @@ -6,8 +6,9 @@ project(Optimal_bounding_box_Examples) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt index c2f277d1f6a..7e9cbce35d8 100644 --- a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt @@ -6,8 +6,9 @@ project(Optimal_bounding_box_Tests) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Orthtree/examples/Orthtree/CMakeLists.txt b/Orthtree/examples/Orthtree/CMakeLists.txt index ac8701d8606..73a301e8d3d 100644 --- a/Orthtree/examples/Orthtree/CMakeLists.txt +++ b/Orthtree/examples/Orthtree/CMakeLists.txt @@ -18,8 +18,9 @@ create_single_source_cgal_program("quadtree_build_from_point_vector.cpp") create_single_source_cgal_program("octree_surface_mesh.cpp") create_single_source_cgal_program("quadtree_build_manually.cpp") -find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if (TARGET CGAL::Eigen3_support) create_single_source_cgal_program("orthtree_build.cpp") target_link_libraries(orthtree_build PRIVATE CGAL::Eigen3_support) diff --git a/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt b/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt index f235193705c..50c39bebe2d 100644 --- a/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt +++ b/Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt @@ -8,8 +8,9 @@ project(Periodic_3_mesh_3_Examples) find_package(CGAL REQUIRED) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt index 9f3c5f07053..bae42b1f1e9 100644 --- a/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt +++ b/Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt @@ -7,8 +7,9 @@ project(Periodic_3_mesh_3_Tests) find_package(CGAL REQUIRED COMPONENTS ImageIO) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Point_set_3/examples/Point_set_3/CMakeLists.txt b/Point_set_3/examples/Point_set_3/CMakeLists.txt index 1019bcd4ef1..59cc7d7bb7f 100644 --- a/Point_set_3/examples/Point_set_3/CMakeLists.txt +++ b/Point_set_3/examples/Point_set_3/CMakeLists.txt @@ -13,8 +13,9 @@ create_single_source_cgal_program("point_set_read_xyz.cpp") create_single_source_cgal_program("point_set_advanced.cpp") create_single_source_cgal_program("point_set_read_ply.cpp") -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("point_set_algo.cpp") target_link_libraries(point_set_algo PRIVATE CGAL::Eigen3_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 index e89373a3bb9..389162a633f 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 @@ -70,8 +70,9 @@ else() endif() # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) # Executables that require Eigen diff --git a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt index f05160e32fc..392350f0cbc 100644 --- a/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt +++ b/Point_set_processing_3/test/Point_set_processing_3/CMakeLists.txt @@ -46,8 +46,9 @@ else() endif() # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) # Executables that require Eigen create_single_source_cgal_program( "normal_estimation_test.cpp" ) diff --git a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt index 3832688cbd9..b09b3bfa080 100644 --- a/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt +++ b/Poisson_surface_reconstruction_3/examples/Poisson_surface_reconstruction_3/CMakeLists.txt @@ -21,9 +21,10 @@ endif() # Activate Parallelism in Mesh_3 option(CGAL_ACTIVATE_CONCURRENT_MESH_3 "Activate parallelism in Mesh_3" OFF) -# Find Eigen3 (requires 3.1.0 or greater) -find_package(Eigen3 3.1.0 QUIET) +# Find Eigen3 +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) # Executables that require Eigen 3 create_single_source_cgal_program("poisson_reconstruction_example.cpp") diff --git a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt index e7adcfdc21a..6c7dacfe602 100644 --- a/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt +++ b/Poisson_surface_reconstruction_3/test/Poisson_surface_reconstruction_3/CMakeLists.txt @@ -20,10 +20,10 @@ if(MSVC) message(STATUS "USING RELEASE EXEFLAGS = '${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_RELEASE}'") endif() -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) - # Executables that require Eigen 3.1 if(TARGET CGAL::TBB_support) create_single_source_cgal_program("poisson_reconstruction_test_surface_mesher.cpp") target_link_libraries(poisson_reconstruction_test_surface_mesher PRIVATE CGAL::Eigen3_support CGAL::TBB_support) diff --git a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt index ab1a6b06092..0ca0205034e 100644 --- a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt @@ -7,8 +7,9 @@ project(Polygon_mesh_processing) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: Benchmarks require Eigen 3.2 (or greater), and will not be compiled") return() diff --git a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt index 717ff715394..88430e902e0 100644 --- a/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/examples/Polygon_mesh_processing/CMakeLists.txt @@ -60,8 +60,9 @@ create_single_source_cgal_program("triangle_mesh_autorefinement.cpp") create_single_source_cgal_program("soup_autorefinement.cpp") create_single_source_cgal_program("snap_polygon_soup.cpp") -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("acvd_remeshing_example.cpp") target_link_libraries(acvd_remeshing_example PUBLIC CGAL::Eigen3_support) diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt index 919ac774e0d..6fcadef5628 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt @@ -76,8 +76,9 @@ create_single_source_cgal_program("issue_8730.cpp") create_single_source_cgal_program("issue_7164.cpp") # create_single_source_cgal_program("test_pmp_repair_self_intersections.cpp") -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("fairing_test.cpp") target_link_libraries(fairing_test PRIVATE CGAL::Eigen3_support) diff --git a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt index 677cfe1d36f..1d2f2c54e73 100644 --- a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt +++ b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt @@ -8,8 +8,9 @@ project(Polygonal_surface_reconstruction_Examples) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.") return() diff --git a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt index 43ee357b3b4..a872690e857 100644 --- a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt +++ b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt @@ -8,8 +8,9 @@ project(Polygonal_surface_reconstruction_Tests) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.") return() diff --git a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt index bfcf7dcc124..db096c9b4f6 100644 --- a/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/demo/Principal_component_analysis/CMakeLists.txt @@ -8,8 +8,9 @@ include_directories(./) # Find CGAL and CGAL Qt6 find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires the Eigen library, and will not be compiled.") return() diff --git a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt index 13cdc5491b6..254c3de5061 100644 --- a/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/examples/Principal_component_analysis/CMakeLists.txt @@ -7,8 +7,9 @@ project(Principal_component_analysis_Examples) find_package(CGAL REQUIRED) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.") return() diff --git a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt index 1de7c904d88..803ec265e1a 100644 --- a/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt +++ b/Principal_component_analysis/test/Principal_component_analysis/CMakeLists.txt @@ -7,8 +7,9 @@ project(Principal_component_analysis_Tests) find_package(CGAL REQUIRED) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.") return() diff --git a/Property_map/examples/Property_map/CMakeLists.txt b/Property_map/examples/Property_map/CMakeLists.txt index 8e54346059c..29ea151ea44 100644 --- a/Property_map/examples/Property_map/CMakeLists.txt +++ b/Property_map/examples/Property_map/CMakeLists.txt @@ -6,8 +6,9 @@ find_package(CGAL REQUIRED) create_single_source_cgal_program("dynamic_properties.cpp") -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("custom_property_map.cpp") target_link_libraries(custom_property_map PRIVATE CGAL::Eigen3_support) diff --git a/Ridges_3/examples/Ridges_3/CMakeLists.txt b/Ridges_3/examples/Ridges_3/CMakeLists.txt index a3bcb30ed91..a096b25a3c8 100644 --- a/Ridges_3/examples/Ridges_3/CMakeLists.txt +++ b/Ridges_3/examples/Ridges_3/CMakeLists.txt @@ -4,8 +4,9 @@ project(Ridges_3_Examples) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) # Link with Boost.ProgramOptions (optional) diff --git a/Ridges_3/test/Ridges_3/CMakeLists.txt b/Ridges_3/test/Ridges_3/CMakeLists.txt index e61df02393c..3f448af8075 100644 --- a/Ridges_3/test/Ridges_3/CMakeLists.txt +++ b/Ridges_3/test/Ridges_3/CMakeLists.txt @@ -6,8 +6,9 @@ project(Ridges_3_Tests) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("ridge_test.cpp") target_link_libraries(ridge_test PRIVATE CGAL::Eigen3_support) diff --git a/SMDS_3/test/SMDS_3/CMakeLists.txt b/SMDS_3/test/SMDS_3/CMakeLists.txt index 643e2676c4b..0ec6d0f0f8f 100644 --- a/SMDS_3/test/SMDS_3/CMakeLists.txt +++ b/SMDS_3/test/SMDS_3/CMakeLists.txt @@ -9,8 +9,9 @@ find_package(CGAL REQUIRED) create_single_source_cgal_program( "test_simplicial_cb_vb.cpp") create_single_source_cgal_program( "test_tet_soup_to_c3t3.cpp") -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program( "test_c3t3.cpp" ) create_single_source_cgal_program( "test_c3t3_io.cpp" ) diff --git a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt index 5210e9a1e61..253b71536f4 100644 --- a/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt +++ b/Scale_space_reconstruction_3/examples/Scale_space_reconstruction_3/CMakeLists.txt @@ -14,8 +14,9 @@ if(ACTIVATE_CONCURRENCY) endif() endif() -find_package(Eigen3 3.1.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("scale_space.cpp") target_link_libraries(scale_space PRIVATE CGAL::Eigen3_support) diff --git a/Shape_detection/benchmark/Shape_detection/CMakeLists.txt b/Shape_detection/benchmark/Shape_detection/CMakeLists.txt index 600d1b6b8b0..f0f2d46ff6c 100644 --- a/Shape_detection/benchmark/Shape_detection/CMakeLists.txt +++ b/Shape_detection/benchmark/Shape_detection/CMakeLists.txt @@ -6,8 +6,9 @@ project(Shape_detection_Benchmarks) find_package(CGAL REQUIRED COMPONENTS Core) -find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("benchmark_region_growing_on_point_set_2.cpp") target_link_libraries(benchmark_region_growing_on_point_set_2 PRIVATE CGAL::Eigen3_support) diff --git a/Shape_detection/examples/Shape_detection/CMakeLists.txt b/Shape_detection/examples/Shape_detection/CMakeLists.txt index 7e5581c3126..558b09e0d8b 100644 --- a/Shape_detection/examples/Shape_detection/CMakeLists.txt +++ b/Shape_detection/examples/Shape_detection/CMakeLists.txt @@ -10,8 +10,9 @@ create_single_source_cgal_program("efficient_RANSAC_with_custom_shape.cpp") create_single_source_cgal_program("efficient_RANSAC_with_parameters.cpp") create_single_source_cgal_program("efficient_RANSAC_with_point_access.cpp") -find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) message(STATUS "Found Eigen 3") diff --git a/Shape_detection/test/Shape_detection/CMakeLists.txt b/Shape_detection/test/Shape_detection/CMakeLists.txt index b8976228add..4c46d46f955 100644 --- a/Shape_detection/test/Shape_detection/CMakeLists.txt +++ b/Shape_detection/test/Shape_detection/CMakeLists.txt @@ -18,10 +18,10 @@ create_single_source_cgal_program("test_efficient_RANSAC_torus_connected_compone create_single_source_cgal_program("test_efficient_RANSAC_torus_parameters.cpp") create_single_source_cgal_program("test_efficient_RANSAC_scene.cpp") -find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) -if(TARGET CGAL::Eigen3_support) +if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("test_region_growing_basic.cpp") create_single_source_cgal_program("test_region_growing_strict.cpp") create_single_source_cgal_program("test_region_growing_on_cube.cpp") diff --git a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt index fc4314a4124..eaafdcd8608 100644 --- a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt +++ b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt @@ -27,8 +27,9 @@ if(TARGET CGAL::OSQP_support) endforeach() # Use Eigen. - find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) + find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) message(STATUS "Found Eigen") diff --git a/Solver_interface/examples/Solver_interface/CMakeLists.txt b/Solver_interface/examples/Solver_interface/CMakeLists.txt index 0eb7b843212..45f86ed6f1d 100644 --- a/Solver_interface/examples/Solver_interface/CMakeLists.txt +++ b/Solver_interface/examples/Solver_interface/CMakeLists.txt @@ -7,8 +7,9 @@ project(Solver_interface_Examples) find_package(CGAL REQUIRED) # Use Eigen -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("singular_value_decomposition.cpp") target_link_libraries(singular_value_decomposition PRIVATE CGAL::Eigen3_support) diff --git a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt index 03b97f1de01..b429e2ddffe 100644 --- a/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt +++ b/Spatial_searching/benchmark/Spatial_searching/CMakeLists.txt @@ -8,8 +8,9 @@ find_package(CGAL REQUIRED COMPONENTS Core) include_directories(BEFORE "include") -find_package(Eigen3 3.1.91 QUIET) # (requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: These benchmarks require Eigen 3.1.91 (or greater), and will not be compiled.") return() diff --git a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt index 71295e2562a..fc68a9d23ca 100644 --- a/Spatial_searching/examples/Spatial_searching/CMakeLists.txt +++ b/Spatial_searching/examples/Spatial_searching/CMakeLists.txt @@ -26,8 +26,9 @@ create_single_source_cgal_program("weighted_Minkowski_distance.cpp") create_single_source_cgal_program("searching_sphere_orthogonally.cpp") create_single_source_cgal_program("splitter_worst_cases.cpp") -find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("fuzzy_range_query.cpp") target_link_libraries(fuzzy_range_query PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt index 8da14e07439..665de48582e 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt @@ -8,8 +8,9 @@ project(Surface_mesh_approximation_Examples) find_package(CGAL REQUIRED) # Use Eigen (for PCA) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.") return() diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt index 35473846c94..51143e3d043 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt @@ -8,8 +8,9 @@ project(Surface_mesh_approximation_Tests) find_package(CGAL REQUIRED) # Use Eigen (for PCA) -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: This project requires Eigen 3.1 (or greater), and will not be compiled.") return() diff --git a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt index c4b711d6aa4..c0756effddc 100644 --- a/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt +++ b/Surface_mesh_deformation/benchmark/Surface_mesh_deformation/optimal_rotation/CMakeLists.txt @@ -3,8 +3,9 @@ project(benchmark_for_closest_rotation) find_package(CGAL REQUIRED COMPONENTS Core) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("benchmark_for_concept_models.cpp") target_link_libraries(benchmark_for_concept_models PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt index 0f1a088904f..063a0fa9d4a 100644 --- a/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/demo/Surface_mesh_deformation/CMakeLists.txt @@ -8,8 +8,9 @@ set_property(DIRECTORY PROPERTY CGAL_NO_TESTING TRUE) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("deform_mesh_for_botsch08_format.cpp") target_link_libraries(deform_mesh_for_botsch08_format PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt index 496bc254011..f662475c8d1 100644 --- a/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/examples/Surface_mesh_deformation/CMakeLists.txt @@ -6,8 +6,9 @@ project(Surface_mesh_deformation_Examples) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("all_roi_assign_example.cpp") create_single_source_cgal_program("all_roi_assign_example_custom_polyhedron.cpp") diff --git a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt index 354813c8e73..6e6bed9c641 100644 --- a/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt +++ b/Surface_mesh_deformation/test/Surface_mesh_deformation/CMakeLists.txt @@ -6,8 +6,9 @@ project(Surface_mesh_deformation_Tests) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.91 QUIET) #(requires 3.1.91 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("Cactus_deformation_session.cpp") target_link_libraries(Cactus_deformation_session PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt index c8f3149f3a0..3b8e1390aef 100644 --- a/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/examples/Surface_mesh_parameterization/CMakeLists.txt @@ -5,8 +5,9 @@ project(Surface_mesh_parameterization_Examples) find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) # Executables that require Eigen 3.1 diff --git a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt index 62639571dca..6ae3ba2aa46 100644 --- a/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt +++ b/Surface_mesh_parameterization/test/Surface_mesh_parameterization/CMakeLists.txt @@ -14,8 +14,9 @@ else() message(STATUS "NOTICE: Examples will be compiled without the SuiteSparse library and UmfPack. Try setting CMAKE_PREFIX_PATH to your SuiteSparse installation.") endif() -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("extensive_parameterization_test.cpp") target_link_libraries(extensive_parameterization_test PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt index 56a52dd5cc4..8f1b6ba9cf6 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt @@ -19,8 +19,9 @@ create_single_source_cgal_program("edge_collapse_all_short_edges.cpp") create_single_source_cgal_program("edge_collapse_bounded_normal_change.cpp") create_single_source_cgal_program("edge_collapse_visitor_surface_mesh.cpp") -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("edge_collapse_garland_heckbert.cpp") target_link_libraries(edge_collapse_garland_heckbert PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt index 75e178c4fd9..7b7a3ed97d8 100644 --- a/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt +++ b/Surface_mesh_simplification/test/Surface_mesh_simplification/CMakeLists.txt @@ -15,8 +15,9 @@ create_single_source_cgal_program("test_edge_profile_link.cpp") create_single_source_cgal_program("test_edge_deprecated_stop_predicates.cpp") create_single_source_cgal_program("test_edge_collapse_stability.cpp") -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("edge_collapse_garland_heckbert_variations.cpp") target_link_libraries(edge_collapse_garland_heckbert_variations PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt index 181714c3a51..8db688a6cf6 100644 --- a/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/benchmark/Surface_mesh_skeletonization/CMakeLists.txt @@ -7,8 +7,9 @@ project(Mean_curvature_skeleton) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("solver_benchmark.cpp") target_link_libraries(solver_benchmark PRIVATE CGAL::Eigen3_support) diff --git a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt index 60ccbd71f69..0a6d82cd80b 100644 --- a/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/examples/Surface_mesh_skeletonization/CMakeLists.txt @@ -6,8 +6,9 @@ project(Surface_mesh_skeletonization_Examples) find_package(CGAL REQUIRED) -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("simple_mcfskel_example.cpp") create_single_source_cgal_program("simple_mcfskel_sm_example.cpp") diff --git a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt index d581a0b6d1a..77eb7615bed 100644 --- a/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt +++ b/Surface_mesh_skeletonization/test/Surface_mesh_skeletonization/CMakeLists.txt @@ -6,8 +6,9 @@ project(Surface_mesh_skeletonization_Tests) find_package(CGAL REQUIRED) -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("MCF_Skeleton_test.cpp") target_link_libraries(MCF_Skeleton_test PRIVATE CGAL::Eigen3_support) diff --git a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt index 1e2f8f0d0ca..e2a803326f9 100644 --- a/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/examples/Tetrahedral_remeshing/CMakeLists.txt @@ -25,8 +25,9 @@ else() endif() # Use Eigen for Mesh_3 -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program( "mesh_and_remesh_polyhedral_domain_with_features.cpp" ) target_link_libraries(mesh_and_remesh_polyhedral_domain_with_features PRIVATE CGAL::Eigen3_support) diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt index bd96756d058..fa4dc3d7bbe 100644 --- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt @@ -28,8 +28,9 @@ cgal_add_test(test_tetrahedral_remeshing_mls) # Tests using Mesh_3 require Eigen -find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("test_mesh_and_remesh_polyhedron_with_features.cpp") target_link_libraries(test_mesh_and_remesh_polyhedron_with_features PRIVATE CGAL::Eigen3_support) diff --git a/Triangulation/applications/Triangulation/CMakeLists.txt b/Triangulation/applications/Triangulation/CMakeLists.txt index 2ed210eb1ca..0760b4c233b 100644 --- a/Triangulation/applications/Triangulation/CMakeLists.txt +++ b/Triangulation/applications/Triangulation/CMakeLists.txt @@ -7,8 +7,9 @@ project(Triangulation_apps) # CGAL and its components find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(NOT TARGET CGAL::Eigen3_support) message("NOTICE: Applications require Eigen 3.1 (or greater), and will not be compiled") return() diff --git a/Triangulation/benchmark/Triangulation/CMakeLists.txt b/Triangulation/benchmark/Triangulation/CMakeLists.txt index 40dbbfd3e36..b4e228a3b89 100644 --- a/Triangulation/benchmark/Triangulation/CMakeLists.txt +++ b/Triangulation/benchmark/Triangulation/CMakeLists.txt @@ -6,8 +6,9 @@ project(Triangulation_benchmark) find_package(CGAL REQUIRED COMPONENTS Core) -find_package(Eigen3 3.1.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) include_directories(BEFORE "include") diff --git a/Triangulation/examples/Triangulation/CMakeLists.txt b/Triangulation/examples/Triangulation/CMakeLists.txt index 34edb7814bc..b84e53035bb 100644 --- a/Triangulation/examples/Triangulation/CMakeLists.txt +++ b/Triangulation/examples/Triangulation/CMakeLists.txt @@ -11,8 +11,9 @@ endif() find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("barycentric_subdivision.cpp") create_single_source_cgal_program("delaunay_triangulation.cpp") diff --git a/Triangulation/test/Triangulation/CMakeLists.txt b/Triangulation/test/Triangulation/CMakeLists.txt index 3d38d402271..300f94e62ea 100644 --- a/Triangulation/test/Triangulation/CMakeLists.txt +++ b/Triangulation/test/Triangulation/CMakeLists.txt @@ -11,8 +11,9 @@ endif() find_package(CGAL REQUIRED) -find_package(Eigen3 3.1.0 QUIET) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) include_directories(BEFORE "include") diff --git a/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt index 380d8b0ad72..2f2ed8245d4 100644 --- a/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt +++ b/Triangulation_on_sphere_2/demo/Triangulation_on_sphere_2/CMakeLists.txt @@ -18,7 +18,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6) # Find Qt6 itself find_package(Qt6 QUIET COMPONENTS Widgets OpenGL) -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) if(CGAL_Qt6_FOUND AND Qt6_FOUND AND TARGET CGAL::Eigen3_support) diff --git a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt index f41b7819920..9953a0f74b4 100644 --- a/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt +++ b/Triangulation_on_sphere_2/test/Triangulation_on_sphere_2/CMakeLists.txt @@ -18,8 +18,9 @@ else() message("NOTICE: Some tests require CGAL_Core (or LEDA), and will not be compiled.") endif() -find_package(Eigen3 3.1.0 QUIET) #(requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program( "test_dtos_dual.cpp" ) target_link_libraries(test_dtos_dual PRIVATE CGAL::Eigen3_support) diff --git a/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt b/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt index e08fd207164..e10e209bad9 100644 --- a/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt +++ b/Voronoi_diagram_2/test/Voronoi_diagram_2/CMakeLists.txt @@ -12,8 +12,9 @@ create_single_source_cgal_program("vda_pt.cpp") create_single_source_cgal_program("vda_rt.cpp") create_single_source_cgal_program("vda_sdg.cpp") -find_package(Eigen3 3.2.0 QUIET) #(requires 3.2.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("vda_tos2.cpp") target_link_libraries(vda_tos2 PRIVATE CGAL::Eigen3_support) diff --git a/Weights/examples/Weights/CMakeLists.txt b/Weights/examples/Weights/CMakeLists.txt index 6679efdee36..88eb7976cb2 100644 --- a/Weights/examples/Weights/CMakeLists.txt +++ b/Weights/examples/Weights/CMakeLists.txt @@ -11,8 +11,9 @@ create_single_source_cgal_program("projection_traits.cpp") create_single_source_cgal_program("custom_traits.cpp") create_single_source_cgal_program("convergence.cpp") -find_package(Eigen3 3.1.0 QUIET) # (requires 3.1.0 or greater) +find_package(Eigen3 QUIET) include(CGAL_Eigen3_support) + if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("weighted_laplacian.cpp") target_link_libraries(weighted_laplacian PRIVATE CGAL::Eigen3_support)