From 95616154d579b618b3514c3234dde09cb574932b Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Wed, 9 Oct 2024 07:19:52 +0100 Subject: [PATCH] More PRIVATE in LCC and Generalized_map --- .../test/Combinatorial_map/CMakeLists.txt | 4 ++-- .../test/Generalized_map/CMakeLists.txt | 4 ++-- .../test/Linear_cell_complex/CMakeLists.txt | 16 ++++++++-------- .../Polygon_mesh_processing/CMakeLists.txt | 2 +- .../test/Polygon_mesh_processing/CMakeLists.txt | 2 +- STL_Extension/test/STL_Extension/CMakeLists.txt | 2 +- .../examples/Shape_detection/CMakeLists.txt | 2 +- .../test/Tetrahedral_remeshing/CMakeLists.txt | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt b/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt index b83c3b00df43..b440e2576362 100644 --- a/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt +++ b/Combinatorial_map/test/Combinatorial_map/CMakeLists.txt @@ -15,12 +15,12 @@ create_single_source_cgal_program(Combinatorial_map_copy_test.cpp ${hfiles}) # Same targets, defining USE_COMPACT_CONTAINER_WITH_INDEX to test index version add_executable(Combinatorial_map_test_index Combinatorial_map_test.cpp ${hfiles}) -target_compile_definitions(Combinatorial_map_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) +target_compile_definitions(Combinatorial_map_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) target_link_libraries(Combinatorial_map_test_index PRIVATE CGAL::CGAL CGAL::Data) cgal_add_compilation_test(Combinatorial_map_test_index) add_executable(Combinatorial_map_copy_test_index Combinatorial_map_copy_test.cpp ${hfiles}) -target_compile_definitions(Combinatorial_map_copy_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) +target_compile_definitions(Combinatorial_map_copy_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) target_link_libraries(Combinatorial_map_copy_test_index PRIVATE CGAL::CGAL CGAL::Data) cgal_add_compilation_test(Combinatorial_map_copy_test_index) diff --git a/Generalized_map/test/Generalized_map/CMakeLists.txt b/Generalized_map/test/Generalized_map/CMakeLists.txt index 5839c02a6985..24ac67748cdc 100644 --- a/Generalized_map/test/Generalized_map/CMakeLists.txt +++ b/Generalized_map/test/Generalized_map/CMakeLists.txt @@ -15,8 +15,8 @@ set(hfiles Generalized_map_2_test.h create_single_source_cgal_program("Generalized_map_test.cpp" ${hfiles}) add_executable(Generalized_map_test_index Generalized_map_test.cpp ${hfiles}) -target_compile_definitions(Generalized_map_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) -target_link_libraries(Generalized_map_test_index PUBLIC CGAL CGAL::Data) +target_compile_definitions(Generalized_map_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) +target_link_libraries(Generalized_map_test_index PRIVATE CGAL CGAL::Data) cgal_add_compilation_test(Generalized_map_test_index) create_single_source_cgal_program("gmap_test_split_attribute.cpp") diff --git a/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt b/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt index dde51b6546b9..3f12de77ceea 100644 --- a/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt +++ b/Linear_cell_complex/test/Linear_cell_complex/CMakeLists.txt @@ -18,21 +18,21 @@ create_single_source_cgal_program(LCC_3_incremental_builder_test.cpp ${hfiles}) # Same targets, defining USE_COMPACT_CONTAINER_WITH_INDEX to test index version add_executable(Linear_cell_complex_2_test_index Linear_cell_complex_2_test.cpp ${hfiles}) -target_compile_definitions(Linear_cell_complex_2_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) -target_link_libraries(Linear_cell_complex_2_test_index PUBLIC CGAL CGAL::Data) +target_compile_definitions(Linear_cell_complex_2_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) +target_link_libraries(Linear_cell_complex_2_test_index PRIVATE CGAL CGAL::Data) cgal_add_compilation_test(Linear_cell_complex_2_test_index) add_executable(Linear_cell_complex_3_test_index Linear_cell_complex_3_test.cpp ${hfiles}) -target_compile_definitions(Linear_cell_complex_3_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) -target_link_libraries(Linear_cell_complex_3_test_index PUBLIC CGAL CGAL::Data) +target_compile_definitions(Linear_cell_complex_3_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) +target_link_libraries(Linear_cell_complex_3_test_index PRIVATE CGAL CGAL::Data) cgal_add_compilation_test(Linear_cell_complex_3_test_index) add_executable(Linear_cell_complex_4_test_index Linear_cell_complex_4_test.cpp ${hfiles}) -target_compile_definitions(Linear_cell_complex_4_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) -target_link_libraries(Linear_cell_complex_4_test_index PUBLIC CGAL CGAL::Data) +target_compile_definitions(Linear_cell_complex_4_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) +target_link_libraries(Linear_cell_complex_4_test_index PRIVATE CGAL CGAL::Data) cgal_add_compilation_test(Linear_cell_complex_4_test_index) add_executable(Linear_cell_complex_copy_test_index Linear_cell_complex_copy_test.cpp ${hfiles}) -target_compile_definitions(Linear_cell_complex_copy_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX) -target_link_libraries(Linear_cell_complex_copy_test_index PUBLIC CGAL CGAL::Data) +target_compile_definitions(Linear_cell_complex_copy_test_index PRIVATE USE_COMPACT_CONTAINER_WITH_INDEX) +target_link_libraries(Linear_cell_complex_copy_test_index PRIVATE CGAL CGAL::Data) cgal_add_compilation_test(Linear_cell_complex_copy_test_index) diff --git a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt index bb3be52226a4..11c27fb7f81b 100644 --- a/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/benchmark/Polygon_mesh_processing/CMakeLists.txt @@ -30,7 +30,7 @@ if (FAST_ENVELOPE_BUILD_DIR) create_single_source_cgal_program("fastE.cpp") target_link_libraries( fastE PRIVATE CGAL::Eigen3_support) - target_link_libraries( fastE PUBLIC FastEnvelope IndirectPredicates geogram) + target_link_libraries( fastE PRIVATE FastEnvelope IndirectPredicates geogram) else() message(STATUS "CMake variable FAST_ENVELOPE_BUILD_DIR is not defined; benchmark 'fastE' will not be built") diff --git a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt index 3d121cbe5109..0dd21ab22e1c 100644 --- a/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt +++ b/Polygon_mesh_processing/test/Polygon_mesh_processing/CMakeLists.txt @@ -126,7 +126,7 @@ include(CGAL_Ceres_support) if(TARGET CGAL::Ceres_support AND TARGET CGAL::Eigen3_support) target_link_libraries(test_mesh_smoothing PRIVATE CGAL::Eigen3_support CGAL::Ceres_support) -# target_compile_definitions(test_pmp_repair_self_intersections PUBLIC CGAL_PMP_USE_CERES_SOLVER) +# target_compile_definitions(test_pmp_repair_self_intersections PRIVATE CGAL_PMP_USE_CERES_SOLVER) # target_link_libraries(test_pmp_repair_self_intersections PRIVATE CGAL::Eigen3_support CGAL::Ceres_support) else() message(STATUS "NOTICE: Tests are not using Ceres.") diff --git a/STL_Extension/test/STL_Extension/CMakeLists.txt b/STL_Extension/test/STL_Extension/CMakeLists.txt index 7e47f6c07be6..fafddb64a219 100644 --- a/STL_Extension/test/STL_Extension/CMakeLists.txt +++ b/STL_Extension/test/STL_Extension/CMakeLists.txt @@ -37,7 +37,7 @@ create_single_source_cgal_program("test_cgal_named_params.cpp") add_executable(test_multiset_cc "test_multiset.cpp") target_link_libraries(test_multiset_cc PRIVATE CGAL::CGAL) -target_compile_options(test_multiset_cc PUBLIC -DCGAL_MULTISET_USE_COMPACT_CONTAINER_AS_DEFAULT) +target_compile_options(test_multiset_cc PRIVATE -DCGAL_MULTISET_USE_COMPACT_CONTAINER_AS_DEFAULT) cgal_add_test(test_multiset_cc) add_to_cached_list(CGAL_EXECUTABLE_TARGETS test_multiset_cc) diff --git a/Shape_detection/examples/Shape_detection/CMakeLists.txt b/Shape_detection/examples/Shape_detection/CMakeLists.txt index bcbd16339b91..0a9425927310 100644 --- a/Shape_detection/examples/Shape_detection/CMakeLists.txt +++ b/Shape_detection/examples/Shape_detection/CMakeLists.txt @@ -26,7 +26,7 @@ if(TARGET CGAL::Eigen3_support) create_single_source_cgal_program("region_growing_lines_on_segment_set.cpp") create_single_source_cgal_program("region_growing_planes_on_polygon_mesh.cpp") add_executable(region_growing_planes_on_polyhedron region_growing_planes_on_polygon_mesh.cpp) - target_compile_definitions(region_growing_planes_on_polyhedron PUBLIC -DUSE_POLYHEDRON) + target_compile_definitions(region_growing_planes_on_polyhedron PRIVATE -DUSE_POLYHEDRON) target_link_libraries(region_growing_planes_on_polyhedron PRIVATE CGAL::CGAL CGAL::Eigen3_support) foreach( diff --git a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt index 1e4d38d7a86d..ba308112e328 100644 --- a/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt +++ b/Tetrahedral_remeshing/test/Tetrahedral_remeshing/CMakeLists.txt @@ -22,7 +22,7 @@ add_executable(test_tetrahedral_remeshing_mls "test_tetrahedral_remeshing.cpp") target_link_libraries(test_tetrahedral_remeshing_mls PRIVATE CGAL::CGAL CGAL::Data) target_compile_definitions(test_tetrahedral_remeshing_mls - PUBLIC -DCGAL_TET_REMESHING_SMOOTHING_WITH_MLS) + PRIVATE -DCGAL_TET_REMESHING_SMOOTHING_WITH_MLS) cgal_add_test(test_tetrahedral_remeshing_mls) @@ -45,7 +45,7 @@ if(TARGET CGAL::Eigen3_support) target_link_libraries(test_mesh_and_remesh_polyhedron_with_features_mls PRIVATE CGAL::CGAL CGAL::Data CGAL::Eigen3_support) target_compile_definitions(test_mesh_and_remesh_polyhedron_with_features_mls - PUBLIC -DCGAL_TET_REMESHING_SMOOTHING_WITH_MLS) + PRIVATE -DCGAL_TET_REMESHING_SMOOTHING_WITH_MLS) cgal_add_test(test_mesh_and_remesh_polyhedron_with_features_mls) if(CGAL_ImageIO_USE_ZLIB)