From 58181afcdbc112b039ecc7a080d9f46a084b91ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Loriot?= Date: Tue, 9 Nov 2021 10:16:12 +0100 Subject: [PATCH] remove useless include directives --- AABB_tree/test/AABB_tree/CMakeLists.txt | 2 -- .../test/Algebraic_foundations/CMakeLists.txt | 2 -- .../examples/Algebraic_kernel_d/CMakeLists.txt | 1 - Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt | 2 -- .../examples/Apollonius_graph_2/CMakeLists.txt | 2 -- Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt | 1 - .../examples/Arrangement_on_surface_2/CMakeLists.txt | 2 -- .../test/Arrangement_on_surface_2/CMakeLists.txt | 1 - .../examples/Barycentric_coordinates_2/CMakeLists.txt | 2 -- .../test/Barycentric_coordinates_2/CMakeLists.txt | 2 -- Bounding_volumes/test/Bounding_volumes/CMakeLists.txt | 2 -- CGAL_Core/examples/Core/CMakeLists.txt | 5 ----- CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt | 1 - CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt | 2 -- Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt | 2 -- Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt | 1 - Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt | 1 - Envelope_3/examples/Envelope_3/CMakeLists.txt | 2 -- Envelope_3/test/Envelope_3/CMakeLists.txt | 2 -- Heat_method_3/examples/Heat_method_3/CMakeLists.txt | 5 ----- Heat_method_3/test/Heat_method_3/CMakeLists.txt | 5 ----- .../examples/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ---- .../test/Hyperbolic_triangulation_2/CMakeLists.txt | 4 ---- Installation/test/Installation/CMakeLists.txt | 4 ---- Interval_support/test/Interval_support/CMakeLists.txt | 2 -- Kernel_23/test/Kernel_23/CMakeLists.txt | 1 - Mesh_2/test/Mesh_2/CMakeLists.txt | 2 -- Mesh_3/test/Mesh_3/CMakeLists.txt | 1 - Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt | 2 -- Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt | 2 -- Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt | 2 -- Number_types/test/Number_types/CMakeLists.txt | 1 - .../examples/Optimal_bounding_box/CMakeLists.txt | 2 -- .../test/Optimal_bounding_box/CMakeLists.txt | 2 -- Periodic_3_mesh_3/examples/Periodic_3_mesh_3/CMakeLists.txt | 2 -- Periodic_3_mesh_3/test/Periodic_3_mesh_3/CMakeLists.txt | 2 -- .../test/Periodic_3_triangulation_3/CMakeLists.txt | 1 - .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 3 --- .../Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt | 3 --- .../test/Polygon_mesh_processing/CMakeLists.txt | 2 -- .../Polygonal_surface_reconstruction/CMakeLists.txt | 5 ----- .../test/Polygonal_surface_reconstruction/CMakeLists.txt | 5 ----- Polynomial/test/Polynomial/CMakeLists.txt | 1 - .../test/Segment_Delaunay_graph_2/CMakeLists.txt | 3 --- .../test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt | 3 --- Shape_detection/examples/Shape_detection/CMakeLists.txt | 3 --- Shape_detection/test/Shape_detection/CMakeLists.txt | 3 --- .../examples/Shape_regularization/CMakeLists.txt | 3 --- .../test/Shape_regularization/CMakeLists.txt | 3 --- .../examples/Straight_skeleton_2/CMakeLists.txt | 6 +----- Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt | 1 - .../examples/Surface_mesh_approximation/CMakeLists.txt | 5 ----- .../test/Surface_mesh_approximation/CMakeLists.txt | 5 ----- .../test/Surface_mesh_shortest_path/CMakeLists.txt | 2 -- .../examples/Surface_mesh_simplification/CMakeLists.txt | 2 -- Surface_mesher/examples/Surface_mesher/CMakeLists.txt | 2 -- Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt | 2 -- Weights/examples/Weights/CMakeLists.txt | 2 -- Weights/test/Weights/CMakeLists.txt | 2 -- 59 files changed, 1 insertion(+), 144 deletions(-) diff --git a/AABB_tree/test/AABB_tree/CMakeLists.txt b/AABB_tree/test/AABB_tree/CMakeLists.txt index fa668b5cead..5005e375885 100644 --- a/AABB_tree/test/AABB_tree/CMakeLists.txt +++ b/AABB_tree/test/AABB_tree/CMakeLists.txt @@ -6,8 +6,6 @@ project(AABB_tree_Tests) find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) # Kept to test the old behaviour. - # create a target per cppfile file( GLOB cppfiles diff --git a/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt b/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt index 47127a5be57..6ae7a92ccbe 100644 --- a/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt +++ b/Algebraic_foundations/test/Algebraic_foundations/CMakeLists.txt @@ -6,8 +6,6 @@ project(Algebraic_foundations_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt index 4e419a83d06..93cdf720fda 100644 --- a/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/examples/Algebraic_kernel_d/CMakeLists.txt @@ -6,7 +6,6 @@ find_package(CGAL REQUIRED COMPONENTS Core) find_package(MPFI QUIET) if(MPFI_FOUND AND NOT CGAL_DISABLE_GMP) - include(${CGAL_USE_FILE}) include(${MPFI_USE_FILE}) include(CGAL_VersionUtils) create_single_source_cgal_program("Compare_1.cpp") diff --git a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt index df3997a3065..5c6d9da8d2d 100644 --- a/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt +++ b/Algebraic_kernel_d/test/Algebraic_kernel_d/CMakeLists.txt @@ -28,8 +28,6 @@ endif() # include for local directory include_directories(BEFORE include) -include(${CGAL_USE_FILE}) - # Creating entries for all .cpp/.C files with "main" routine # ########################################################## diff --git a/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt b/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt index a72517973a0..71d1e365e04 100644 --- a/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt +++ b/Apollonius_graph_2/examples/Apollonius_graph_2/CMakeLists.txt @@ -6,8 +6,6 @@ project(Apollonius_graph_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt index de65fd58a3c..64584378df1 100644 --- a/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt +++ b/Arithmetic_kernel/test/Arithmetic_kernel/CMakeLists.txt @@ -10,7 +10,6 @@ find_package(GMP QUIET) if(GMP_FOUND) - include(${CGAL_USE_FILE}) include(CGAL_VersionUtils) get_dependency_version(GMP) diff --git a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt index bc6270c4315..bda708bc191 100644 --- a/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt +++ b/Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt @@ -6,8 +6,6 @@ project(Arrangement_on_surface_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt index 6cb598d9b9a..342c094fb78 100644 --- a/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt +++ b/Arrangement_on_surface_2/test/Arrangement_on_surface_2/CMakeLists.txt @@ -8,7 +8,6 @@ enable_testing() find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) # Since CMake-2.8.12: New CMake script, that defines the targets and # the CTest test cases. include(${CMAKE_CURRENT_SOURCE_DIR}/cgal_test.cmake) diff --git a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt index 25d24e64072..97115ce1a32 100644 --- a/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt @@ -7,8 +7,6 @@ cmake_minimum_required(VERSION 3.1...3.20) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("segment_coordinates.cpp") create_single_source_cgal_program("triangle_coordinates.cpp") diff --git a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt index 46acd7c2bb5..bd3f429bde4 100644 --- a/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt +++ b/Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt @@ -7,8 +7,6 @@ cmake_minimum_required(VERSION 3.1...3.20) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("test_almost_degenerate_segment.cpp") create_single_source_cgal_program("test_segment_coordinates.cpp") diff --git a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt index 8bc2edb3809..7b92b2bc5fc 100644 --- a/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt +++ b/Bounding_volumes/test/Bounding_volumes/CMakeLists.txt @@ -6,8 +6,6 @@ project(Bounding_volumes_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # Use Eigen find_package(Eigen3 3.1.0 QUIET) #(3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/CGAL_Core/examples/Core/CMakeLists.txt b/CGAL_Core/examples/Core/CMakeLists.txt index 453c4e98acc..e4fa35a7a79 100644 --- a/CGAL_Core/examples/Core/CMakeLists.txt +++ b/CGAL_Core/examples/Core/CMakeLists.txt @@ -25,11 +25,6 @@ if(NOT Boost_FOUND) endif() -# include for local directory - -# include for local package -include(${CGAL_USE_FILE}) - # Creating entries for all .cpp/.C files with "main" routine # ########################################################## diff --git a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt index 339e5de6c13..b84fd71eee7 100644 --- a/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt +++ b/CGAL_ImageIO/examples/CGALimageIO/CMakeLists.txt @@ -11,7 +11,6 @@ endif() find_package(CGAL REQUIRED COMPONENTS ImageIO) if(CGAL_ImageIO_FOUND) - include(${CGAL_USE_FILE}) create_single_source_cgal_program("convert_raw_image_to_inr.cpp") create_single_source_cgal_program("test_imageio.cpp") diff --git a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt index 924261289eb..05e0a8addda 100644 --- a/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt +++ b/CGAL_ImageIO/test/CGAL_ImageIO/CMakeLists.txt @@ -10,8 +10,6 @@ endif() find_package(CGAL REQUIRED COMPONENTS ImageIO) -include(${CGAL_USE_FILE}) - if(WITH_CGAL_ImageIO) create_single_source_cgal_program("test_trilinear_interpolation.cpp") else() diff --git a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt index ef9c99de8d0..bb6b519b602 100644 --- a/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt +++ b/Circular_kernel_3/test/Circular_kernel_3/CMakeLists.txt @@ -6,8 +6,6 @@ project(Circular_kernel_3_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - include_directories(BEFORE include) # The following `include_directories` is used in the git layout diff --git a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt index fcb8d65e14f..e7b8b9a77fe 100644 --- a/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt +++ b/Cone_spanners_2/examples/Cone_spanners_2/CMakeLists.txt @@ -2,7 +2,6 @@ cmake_minimum_required(VERSION 3.1...3.20) project(Cone_spanners_2_Examples) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core) -include(${CGAL_USE_FILE}) find_package(LEDA QUIET) if(CGAL_Core_FOUND OR LEDA_FOUND) diff --git a/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt b/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt index 3dc0689cdbb..2c2ab9ffc54 100644 --- a/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt +++ b/Cone_spanners_2/test/Cone_spanners_2/CMakeLists.txt @@ -7,7 +7,6 @@ project(Cone_spanners_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) if(CGAL_Core_FOUND) - include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Envelope_3/examples/Envelope_3/CMakeLists.txt b/Envelope_3/examples/Envelope_3/CMakeLists.txt index 0159c22a4a6..079c5116f44 100644 --- a/Envelope_3/examples/Envelope_3/CMakeLists.txt +++ b/Envelope_3/examples/Envelope_3/CMakeLists.txt @@ -6,8 +6,6 @@ project(Envelope_3_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Envelope_3/test/Envelope_3/CMakeLists.txt b/Envelope_3/test/Envelope_3/CMakeLists.txt index 7a3a11e066c..ecf62fc1a53 100644 --- a/Envelope_3/test/Envelope_3/CMakeLists.txt +++ b/Envelope_3/test/Envelope_3/CMakeLists.txt @@ -6,8 +6,6 @@ project(Envelope_3_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt index 075aee59e59..17fc119aff8 100644 --- a/Heat_method_3/examples/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/examples/Heat_method_3/CMakeLists.txt @@ -7,9 +7,6 @@ project(Heat_method_3_Examples) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) @@ -39,8 +36,6 @@ include_directories(BEFORE include) # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("heat_method.cpp") target_link_libraries(heat_method PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("heat_method_polyhedron.cpp") diff --git a/Heat_method_3/test/Heat_method_3/CMakeLists.txt b/Heat_method_3/test/Heat_method_3/CMakeLists.txt index 898dd5d0135..fdd57834f0a 100644 --- a/Heat_method_3/test/Heat_method_3/CMakeLists.txt +++ b/Heat_method_3/test/Heat_method_3/CMakeLists.txt @@ -7,9 +7,6 @@ project(Heat_method_3_Tests) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) @@ -39,8 +36,6 @@ include_directories(BEFORE include) # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("heat_method_concept.cpp") target_link_libraries(heat_method_concept PUBLIC CGAL::Eigen3_support) create_single_source_cgal_program("heat_method_surface_mesh_test.cpp") diff --git a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt index cb32ca80aa3..5c55b9e512e 100644 --- a/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/examples/Hyperbolic_triangulation_2/CMakeLists.txt @@ -6,9 +6,5 @@ project(Hyperbolic_triangulation_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("ht2_example.cpp") create_single_source_cgal_program("ht2_example_color.cpp") diff --git a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt index 3a3d4453526..ecf486d9219 100644 --- a/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt +++ b/Hyperbolic_triangulation_2/test/Hyperbolic_triangulation_2/CMakeLists.txt @@ -6,10 +6,6 @@ project(Hyperbolic_triangulation_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("ht2_test_clear.cpp") create_single_source_cgal_program("ht2_test_locate.cpp") create_single_source_cgal_program("ht2_test_remove.cpp") diff --git a/Installation/test/Installation/CMakeLists.txt b/Installation/test/Installation/CMakeLists.txt index c8df586454b..dd05380cf8f 100644 --- a/Installation/test/Installation/CMakeLists.txt +++ b/Installation/test/Installation/CMakeLists.txt @@ -32,10 +32,6 @@ endmacro() find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("endian.cpp") create_single_source_cgal_program("deprecation_warning.cpp") diff --git a/Interval_support/test/Interval_support/CMakeLists.txt b/Interval_support/test/Interval_support/CMakeLists.txt index 8d64c1370fb..d338d07a741 100644 --- a/Interval_support/test/Interval_support/CMakeLists.txt +++ b/Interval_support/test/Interval_support/CMakeLists.txt @@ -6,8 +6,6 @@ project(Interval_support_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Kernel_23/test/Kernel_23/CMakeLists.txt b/Kernel_23/test/Kernel_23/CMakeLists.txt index f171f3bc1d2..3eb49bcf083 100644 --- a/Kernel_23/test/Kernel_23/CMakeLists.txt +++ b/Kernel_23/test/Kernel_23/CMakeLists.txt @@ -6,7 +6,6 @@ project(Kernel_23_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Mesh_2/test/Mesh_2/CMakeLists.txt b/Mesh_2/test/Mesh_2/CMakeLists.txt index 351903fa5b8..a940e19ed64 100644 --- a/Mesh_2/test/Mesh_2/CMakeLists.txt +++ b/Mesh_2/test/Mesh_2/CMakeLists.txt @@ -6,8 +6,6 @@ project(Mesh_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Mesh_3/test/Mesh_3/CMakeLists.txt b/Mesh_3/test/Mesh_3/CMakeLists.txt index bb118f9314b..162ae9aebce 100644 --- a/Mesh_3/test/Mesh_3/CMakeLists.txt +++ b/Mesh_3/test/Mesh_3/CMakeLists.txt @@ -13,7 +13,6 @@ endif() find_package(CGAL QUIET COMPONENTS ImageIO) if ( CGAL_FOUND ) - include( ${CGAL_USE_FILE} ) find_package( TBB QUIET ) include(CGAL_TBB_support) diff --git a/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt b/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt index 40564eb5578..9f0b5b9a86a 100644 --- a/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt +++ b/Minkowski_sum_2/examples/Minkowski_sum_2/CMakeLists.txt @@ -6,8 +6,6 @@ project(Minkowski_sum_2_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt b/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt index 4021f8076e7..1434f8d0c05 100644 --- a/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt +++ b/Minkowski_sum_2/test/Minkowski_sum_2/CMakeLists.txt @@ -13,8 +13,6 @@ project(Minkowski_sum_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt b/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt index 2c66e3a2456..d7909096be7 100644 --- a/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt +++ b/Modular_arithmetic/test/Modular_arithmetic/CMakeLists.txt @@ -6,8 +6,6 @@ project(Modular_arithmetic_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # create a target per cppfile file( GLOB cppfiles diff --git a/Number_types/test/Number_types/CMakeLists.txt b/Number_types/test/Number_types/CMakeLists.txt index 791f5ffd298..808ea2547e4 100644 --- a/Number_types/test/Number_types/CMakeLists.txt +++ b/Number_types/test/Number_types/CMakeLists.txt @@ -8,7 +8,6 @@ project(Number_types_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include(CGAL_VersionUtils) include_directories(BEFORE include) diff --git a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt index ff52fd6ef81..f8c83fe2846 100644 --- a/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/examples/Optimal_bounding_box/CMakeLists.txt @@ -6,8 +6,6 @@ project(Optimal_bounding_box_Examples) find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) - find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) include(CGAL_Eigen3_support) if(NOT TARGET CGAL::Eigen3_support) diff --git a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt index b144a7fe34d..16b7ee5ac30 100644 --- a/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt +++ b/Optimal_bounding_box/test/Optimal_bounding_box/CMakeLists.txt @@ -6,8 +6,6 @@ project(Optimal_bounding_box_Tests) find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) - find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) include(CGAL_Eigen3_support) if(NOT TARGET 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 d7e8143114a..16b5057ee9e 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 @@ -11,8 +11,6 @@ endif() # CGAL and its components find_package(CGAL REQUIRED COMPONENTS ImageIO) -include(${CGAL_USE_FILE}) - # include for local package # Use Eigen 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 276905f1707..6602cb47956 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 @@ -10,8 +10,6 @@ endif() find_package(CGAL REQUIRED COMPONENTS ImageIO) -include(${CGAL_USE_FILE}) - # Use Eigen find_package(Eigen3 3.1.0 REQUIRED) #(3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/CMakeLists.txt b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/CMakeLists.txt index 746152dba5a..8de417a733d 100644 --- a/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/CMakeLists.txt +++ b/Periodic_3_triangulation_3/test/Periodic_3_triangulation_3/CMakeLists.txt @@ -6,7 +6,6 @@ project(Periodic_3_triangulation_3_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") create_single_source_cgal_program("test_p3rt3_as_p3t3.cpp") diff --git a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index 964f9dd8629..9da657a92b3 100644 --- a/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/examples/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -2,13 +2,10 @@ cmake_minimum_required(VERSION 3.1...3.20) project(Periodic_4_hyperbolic_triangulation_2_Examples) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core) -include(${CGAL_USE_FILE}) find_package(LEDA QUIET) if((CGAL_Core_FOUND OR LEDA_FOUND)) - include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("p4ht2_example_insertion.cpp") else() diff --git a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt index 5f52873fe0f..35702c7d8e2 100644 --- a/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt +++ b/Periodic_4_hyperbolic_triangulation_2/test/Periodic_4_hyperbolic_triangulation_2/CMakeLists.txt @@ -2,13 +2,10 @@ cmake_minimum_required(VERSION 3.1...3.20) project(Periodic_4_hyperbolic_triangulation_2_Tests) find_package(CGAL REQUIRED QUIET OPTIONAL_COMPONENTS Core) -include(${CGAL_USE_FILE}) find_package(LEDA QUIET) if((CGAL_Core_FOUND OR LEDA_FOUND)) - include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("test_p4ht2_construct_point_2.cpp") create_single_source_cgal_program("test_p4ht2_exact_complex_numbers.cpp") create_single_source_cgal_program("test_p4ht2_intersections.cpp") diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt index c3e7dfb367a..a5493e5e120 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt @@ -7,8 +7,6 @@ project(Polygon_mesh_processing_Tests) # CGAL and its components find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) diff --git a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt index 7311df1dc30..ba778b9b398 100644 --- a/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt +++ b/Polygonal_surface_reconstruction/examples/Polygonal_surface_reconstruction/CMakeLists.txt @@ -8,9 +8,6 @@ cmake_minimum_required(VERSION 3.1...3.20) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) @@ -28,8 +25,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater) include(CGAL_Eigen3_support) if(NOT TARGET CGAL::Eigen3_support) diff --git a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt index e1426b64230..44ef97db225 100644 --- a/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt +++ b/Polygonal_surface_reconstruction/test/Polygonal_surface_reconstruction/CMakeLists.txt @@ -8,9 +8,6 @@ cmake_minimum_required(VERSION 3.1...3.20) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost REQUIRED) @@ -28,8 +25,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater) include(CGAL_Eigen3_support) if(NOT TARGET CGAL::Eigen3_support) diff --git a/Polynomial/test/Polynomial/CMakeLists.txt b/Polynomial/test/Polynomial/CMakeLists.txt index de1b93065bf..2a88f1f01f0 100644 --- a/Polynomial/test/Polynomial/CMakeLists.txt +++ b/Polynomial/test/Polynomial/CMakeLists.txt @@ -6,7 +6,6 @@ project(Polynomial_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt index e084f7c46e2..1ab5ac83fc8 100644 --- a/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_2/test/Segment_Delaunay_graph_2/CMakeLists.txt @@ -6,9 +6,6 @@ project(Segment_Delaunay_graph_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include_directories(BEFORE "include") - # create a target per cppfile file( GLOB cppfiles diff --git a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt index 93fce56bc77..a71ddb49c3c 100644 --- a/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt +++ b/Segment_Delaunay_graph_Linf_2/test/Segment_Delaunay_graph_Linf_2/CMakeLists.txt @@ -6,9 +6,6 @@ project(Segment_Delaunay_graph_Linf_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include_directories(BEFORE "include") - # create a target per cppfile file( GLOB cppfiles diff --git a/Shape_detection/examples/Shape_detection/CMakeLists.txt b/Shape_detection/examples/Shape_detection/CMakeLists.txt index 3029f315f44..4f7e708b2c5 100644 --- a/Shape_detection/examples/Shape_detection/CMakeLists.txt +++ b/Shape_detection/examples/Shape_detection/CMakeLists.txt @@ -6,9 +6,6 @@ project(Shape_detection_Examples) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Use Eigen. find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/Shape_detection/test/Shape_detection/CMakeLists.txt b/Shape_detection/test/Shape_detection/CMakeLists.txt index e24e8fe6270..0bd3adc8255 100644 --- a/Shape_detection/test/Shape_detection/CMakeLists.txt +++ b/Shape_detection/test/Shape_detection/CMakeLists.txt @@ -6,9 +6,6 @@ project(Shape_detection_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Use Eigen. find_package(Eigen3 3.1.0 QUIET) # (3.1.0 or greater) include(CGAL_Eigen3_support) diff --git a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt index 122767cb578..0fc073b3be6 100644 --- a/Shape_regularization/examples/Shape_regularization/CMakeLists.txt +++ b/Shape_regularization/examples/Shape_regularization/CMakeLists.txt @@ -8,9 +8,6 @@ set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Find OSQP library and headers. find_package(OSQP QUIET) include(CGAL_OSQP_support) diff --git a/Shape_regularization/test/Shape_regularization/CMakeLists.txt b/Shape_regularization/test/Shape_regularization/CMakeLists.txt index 75373d7f827..42cc3eb343d 100644 --- a/Shape_regularization/test/Shape_regularization/CMakeLists.txt +++ b/Shape_regularization/test/Shape_regularization/CMakeLists.txt @@ -8,9 +8,6 @@ set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) - # Find OSQP library and headers. find_package(OSQP QUIET) include(CGAL_OSQP_support) diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt index c1b809766d3..11a7036e91e 100644 --- a/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt +++ b/Straight_skeleton_2/examples/Straight_skeleton_2/CMakeLists.txt @@ -5,11 +5,7 @@ cmake_minimum_required(VERSION 3.1...3.20) project( Straight_skeleton_2_Examples ) -find_package(CGAL REQUIRED COMPONENTS Core) - -find_package(CGAL COMPONENTS Qt5) - -include(${CGAL_USE_FILE}) +find_package(CGAL REQUIRED COMPONENTS Qt5 Core) # create a target per cppfile file(GLOB cppfiles RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt index 69ce1c69277..108eab12e68 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt +++ b/Straight_skeleton_2/test/Straight_skeleton_2/CMakeLists.txt @@ -6,7 +6,6 @@ project(Straight_skeleton_2_Tests) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) include_directories(BEFORE "include") # create a target per cppfile diff --git a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt index 17e67899cc2..ee105933111 100644 --- a/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/examples/Surface_mesh_approximation/CMakeLists.txt @@ -7,9 +7,6 @@ project(Surface_mesh_approximation_Examples) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost find_package(Boost) if(NOT Boost_FOUND) @@ -30,8 +27,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("vsa_approximation_2_example.cpp") target_link_libraries(vsa_approximation_2_example PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt index 84735eac579..6ab39e04679 100644 --- a/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt +++ b/Surface_mesh_approximation/test/Surface_mesh_approximation/CMakeLists.txt @@ -7,9 +7,6 @@ project(Surface_mesh_approximation_Tests) # CGAL and its components find_package(CGAL REQUIRED) -# include helper file -include(${CGAL_USE_FILE}) - # Boost find_package(Boost) if(NOT Boost_FOUND) @@ -30,8 +27,6 @@ endif() # Creating entries for all C++ files with "main" routine # ########################################################## -include(CGAL_CreateSingleSourceCGALProgram) - create_single_source_cgal_program("vsa_class_interface_test.cpp") target_link_libraries(vsa_class_interface_test PUBLIC CGAL::Eigen3_support) diff --git a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt index f5a4fd2a4fc..c9dcb5712f3 100644 --- a/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt +++ b/Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/CMakeLists.txt @@ -3,8 +3,6 @@ project(Surface_mesh_shortest_path_Tests) find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Core) -include(${CGAL_USE_FILE}) - find_package(LEDA QUIET) include_directories(BEFORE "include") diff --git a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt index 0775b1d9c33..23334c8afbe 100644 --- a/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt +++ b/Surface_mesh_simplification/examples/Surface_mesh_simplification/CMakeLists.txt @@ -7,8 +7,6 @@ project(Surface_mesh_simplification_Examples) # CGAL and its components find_package(CGAL REQUIRED) -include(${CGAL_USE_FILE}) - # Boost and its components find_package(Boost) if(NOT Boost_FOUND) diff --git a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt index 20f0d37f023..c91695daf4c 100644 --- a/Surface_mesher/examples/Surface_mesher/CMakeLists.txt +++ b/Surface_mesher/examples/Surface_mesher/CMakeLists.txt @@ -11,8 +11,6 @@ find_package(CGAL REQUIRED COMPONENTS ImageIO) if(CGAL_ImageIO_FOUND) - include(${CGAL_USE_FILE}) - create_single_source_cgal_program("mesh_a_3d_gray_image.cpp") create_single_source_cgal_program("mesh_an_implicit_function.cpp") diff --git a/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt b/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt index a027fcd675b..c6179eb9f3f 100644 --- a/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt +++ b/Surface_sweep_2/test/Surface_sweep_2/CMakeLists.txt @@ -15,8 +15,6 @@ set(TRAP 1) # Trapezoidal decomposition set(NAIVE 2) set(WALK 3) -include(${CGAL_USE_FILE}) - function(compile name source_file point_location traits) # message(compile ${source_file}) add_executable(${name} ${source_file}) diff --git a/Weights/examples/Weights/CMakeLists.txt b/Weights/examples/Weights/CMakeLists.txt index 5a4330bea50..22c1abf9177 100644 --- a/Weights/examples/Weights/CMakeLists.txt +++ b/Weights/examples/Weights/CMakeLists.txt @@ -7,8 +7,6 @@ cmake_minimum_required(VERSION 3.1...3.20) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("weights.cpp") create_single_source_cgal_program("coordinates_one_query.cpp") diff --git a/Weights/test/Weights/CMakeLists.txt b/Weights/test/Weights/CMakeLists.txt index 5dc6b53b2e5..5f54c2a3cce 100644 --- a/Weights/test/Weights/CMakeLists.txt +++ b/Weights/test/Weights/CMakeLists.txt @@ -7,8 +7,6 @@ cmake_minimum_required(VERSION 3.1...3.20) set(CMAKE_CXX_STANDARD 14) find_package(CGAL REQUIRED COMPONENTS Core) -include(${CGAL_USE_FILE}) -include(CGAL_CreateSingleSourceCGALProgram) create_single_source_cgal_program("test_uniform_weights.cpp") create_single_source_cgal_program("test_shepard_weights.cpp")