Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CGAL: Modernize CMakeLists.txt #8528

Open
wants to merge 26 commits into
base: master
Choose a base branch
from
Open

CGAL: Modernize CMakeLists.txt #8528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5275693
CGAL: Modernize CMakeLists.txt
afabri Oct 8, 2024
63928f5
Eigen_support -> Eigen3_support (concerns kinetic @soesau)
afabri Oct 8, 2024
eaa2dfc
Eigen_support -> Eigen3_support (concerns kinetic @soesau)
afabri Oct 8, 2024
59903f1
I guess this was before inherited from one of the item classes @lrineau
afabri Oct 8, 2024
ad8ece6
more plugins depend on Eigen
afabri Oct 8, 2024
520a1af
Can we savely remove add_definitions(-DQT_NO_KEYWORDS) @lrineau ?
afabri Oct 9, 2024
9561615
More PRIVATE in LCC and Generalized_map
afabri Oct 9, 2024
74e8e23
Use target_compile_definitions()
afabri Oct 9, 2024
d817dda
Use target_compile_definitions()
afabri Oct 9, 2024
10b3705
Only link to Boost::program_options and not to Do the same later …
afabri Oct 9, 2024
9e75ab3
Use add_compile_definitions
afabri Oct 9, 2024
5829760
No need to include from ../../include
afabri Oct 9, 2024
9bf4134
Only link with Boost::program_options - Supported the minimum require…
afabri Oct 9, 2024
63d2a26
Use Boost::serialization and Boost::iostreams
afabri Oct 9, 2024
4bde1e6
missing )
afabri Oct 10, 2024
ec895d6
Simplified CMakeLists of Point_set_processing @soesau please check
afabri Oct 10, 2024
9edf6ea
Cleanup in Shape_detection
afabri Oct 10, 2024
2ca1c4e
first batch of modifications during my review
lrineau Oct 14, 2024
c0b59bd
second batch of modifications after review
lrineau Oct 16, 2024
d759e72
third batch of modifications
lrineau Oct 16, 2024
96cd3e6
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
lrineau Oct 16, 2024
d7dc57f
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
lrineau Oct 16, 2024
a0d79b7
fix the documentation
lrineau Oct 16, 2024
439df74
leftovers I had not pointed out
lrineau Oct 17, 2024
868e351
fixes
lrineau Oct 21, 2024
fb2a9ea
Merge remote-tracking branch 'cgal/master' into pr/afabri/8528
lrineau Oct 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion AABB_tree/demo/AABB_tree/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package(Qt6 QUIET COMPONENTS Gui OpenGL)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)

# Instruct CMake to run moc/ui/rcc automatically when needed.
set(CMAKE_AUTOMOC ON)
Expand Down
2 changes: 1 addition & 1 deletion Alpha_shapes_3/demo/Alpha_shapes_3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ find_package(Qt6 QUIET COMPONENTS Widgets OpenGL)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)

# Instruct CMake to run moc/ui/rcc automatically when needed.
set(CMAKE_AUTOMOC ON)
Expand Down
2 changes: 1 addition & 1 deletion Arrangement_on_surface_2/demo/Arrangement_on_surface_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if (CGAL_Qt6_FOUND AND Qt6_FOUND)
set(CMAKE_INCLUDE_CURRENT_DIR ON)

# Arrangement package includes
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
option(COMPILE_UTILS_INCREMENTALLY
"Compile files in Utils directory incrementally, or compile them all as a unit. \
Incremental compilation will be better for development and consume less \
Expand Down
2 changes: 1 addition & 1 deletion Arrangement_on_surface_2/demo/Arrangement_on_surface_2_earth/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ endif()



add_definitions(-DQT_NO_VERSION_TAGGING)
add_compile_definitions(-DQT_NO_VERSION_TAGGING)

# AOS
file(GLOB source_files_aos Aos.h Aos.cpp Aos_defs.h
Expand Down
18 changes: 9 additions & 9 deletions Arrangement_on_surface_2/examples/Arrangement_on_surface_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ foreach(cppfile ${cppfiles})
endforeach()

if(CGAL_Qt6_FOUND)
target_link_libraries(draw_arr PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(linear_conics PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(parabolas PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(ellipses PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(hyperbolas PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(polylines PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(circles PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(circular_arcs PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(spherical_insert PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_arr PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(linear_conics PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(parabolas PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(ellipses PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(hyperbolas PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(polylines PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(circles PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(circular_arcs PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(spherical_insert PRIVATE CGAL::CGAL_Basic_viewer)
else()
message(
STATUS
Expand Down
2 changes: 1 addition & 1 deletion BGL/examples/BGL_polyhedron_3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ find_package(METIS QUIET)
include(CGAL_METIS_support)
if(TARGET CGAL::METIS_support)
create_single_source_cgal_program("polyhedron_partition.cpp")
target_link_libraries(polyhedron_partition PUBLIC CGAL::METIS_support)
target_link_libraries(polyhedron_partition PRIVATE CGAL::METIS_support)
else()
message(STATUS "NOTICE: The example 'polyhedron_partition' requires the METIS library, and will not be compiled.")
endif()
2 changes: 1 addition & 1 deletion BGL/examples/BGL_surface_mesh/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package(METIS QUIET)
include(CGAL_METIS_support)
if(TARGET CGAL::METIS_support)
create_single_source_cgal_program("surface_mesh_partition.cpp")
target_link_libraries(surface_mesh_partition PUBLIC CGAL::METIS_support)
target_link_libraries(surface_mesh_partition PRIVATE CGAL::METIS_support)
else()
message(STATUS "NOTICE: Examples that use the METIS library will not be compiled.")
endif()
4 changes: 2 additions & 2 deletions Barycentric_coordinates_2/benchmark/Barycentric_coordinates_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ 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("benchmark_hm_4_vertices.cpp")
target_link_libraries(benchmark_hm_4_vertices PUBLIC CGAL::Eigen3_support)
target_link_libraries(benchmark_hm_4_vertices PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("benchmark_hm_n_vertices.cpp")
target_link_libraries(benchmark_hm_n_vertices PUBLIC CGAL::Eigen3_support)
target_link_libraries(benchmark_hm_n_vertices PRIVATE CGAL::Eigen3_support)
else()
message(STATUS "NOTICE: Several benchmarks require the Eigen library, and will not be compiled.")
endif()
6 changes: 3 additions & 3 deletions Barycentric_coordinates_2/examples/Barycentric_coordinates_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ 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("affine_coordinates.cpp")
target_link_libraries(affine_coordinates PUBLIC CGAL::Eigen3_support)
target_link_libraries(affine_coordinates PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("harmonic_coordinates.cpp")
target_link_libraries(harmonic_coordinates PUBLIC CGAL::Eigen3_support)
target_link_libraries(harmonic_coordinates PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("shape_deformation.cpp")
target_link_libraries(shape_deformation PUBLIC CGAL::Eigen3_support)
target_link_libraries(shape_deformation PRIVATE CGAL::Eigen3_support)
else()
message(STATUS "NOTICE: Several examples require the Eigen library, and will not be compiled.")
endif()
10 changes: 5 additions & 5 deletions Barycentric_coordinates_2/test/Barycentric_coordinates_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ 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("test_hm_unit_square.cpp")
target_link_libraries(test_hm_unit_square PUBLIC CGAL::Eigen3_support)
target_link_libraries(test_hm_unit_square PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("test_hm_const_linear_precision.cpp")
target_link_libraries(test_hm_const_linear_precision PUBLIC CGAL::Eigen3_support)
target_link_libraries(test_hm_const_linear_precision PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("test_hm_triangle.cpp")
target_link_libraries(test_hm_triangle PUBLIC CGAL::Eigen3_support)
target_link_libraries(test_hm_triangle PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("test_bc_projection_traits.cpp")
target_link_libraries(test_bc_projection_traits PUBLIC CGAL::Eigen3_support)
target_link_libraries(test_bc_projection_traits PRIVATE CGAL::Eigen3_support)
create_single_source_cgal_program("test_bc_all_coordinates.cpp")
target_link_libraries(test_bc_all_coordinates PUBLIC CGAL::Eigen3_support)
target_link_libraries(test_bc_all_coordinates PRIVATE CGAL::Eigen3_support)
else()
message(STATUS "NOTICE: Several tests require the Eigen library, and will not be compiled.")
endif()
16 changes: 8 additions & 8 deletions Basic_viewer/examples/Basic_viewer/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,19 +23,19 @@ create_single_source_cgal_program("draw_surface_mesh_vcolor.cpp")

if(CGAL_Qt6_FOUND)
#link it with the required CGAL libraries
target_link_libraries(draw_lcc PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_mesh_and_points PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_several_windows PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_surface_mesh_height PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_surface_mesh_small_faces PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_surface_mesh_vcolor PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_lcc PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_mesh_and_points PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_several_windows PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_surface_mesh_height PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_surface_mesh_small_faces PRIVATE CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_surface_mesh_vcolor PRIVATE CGAL::CGAL_Basic_viewer)
else()
message("CGAL_Qt6 not configured: examples that require Qt will not be compiled.")
endif()

if(TARGET CGAL::Eigen3_support)
target_link_libraries(draw_mesh_and_points PUBLIC CGAL::Eigen3_support)
target_link_libraries(draw_several_windows PUBLIC CGAL::Eigen3_support)
target_link_libraries(draw_mesh_and_points PRIVATE CGAL::Eigen3_support)
target_link_libraries(draw_several_windows PRIVATE CGAL::Eigen3_support)
endif()

#end of the file
2 changes: 1 addition & 1 deletion Boolean_set_operations_2/examples/Boolean_set_operations_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ foreach(cppfile ${cppfiles})
endforeach()

if(CGAL_Qt6_FOUND)
target_link_libraries(draw_polygon_set PUBLIC CGAL::CGAL_Basic_viewer)
target_link_libraries(draw_polygon_set PRIVATE CGAL::CGAL_Basic_viewer)
else()
message(STATUS "NOTICE: The example 'draw_polygon_set' requires Qt and drawing will be disabled.")
endif()
2 changes: 1 addition & 1 deletion Box_intersection_d/test/Box_intersection_d/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ create_single_source_cgal_program("test_Has_member_report.cpp")
find_package(TBB QUIET)
include(CGAL_TBB_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(test_box_grid PUBLIC CGAL::TBB_support)
target_link_libraries(test_box_grid PRIVATE CGAL::TBB_support)
else()
message(STATUS "NOTICE: Intel TBB was not found. Parallel code will not be used.")
endif()
10 changes: 5 additions & 5 deletions Classification/examples/Classification/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ if(TARGET CGAL::OpenCV_support)
message(STATUS "Found OpenCV")

create_single_source_cgal_program( "example_opencv_random_forest.cpp" )
target_link_libraries(example_opencv_random_forest PUBLIC CGAL::OpenCV_support)
target_link_libraries(example_opencv_random_forest PRIVATE CGAL::OpenCV_support)
else()
message("NOTICE: OpenCV was not found. OpenCV random forest predicate for classification won't be available.")
endif()
Expand All @@ -68,11 +68,11 @@ foreach(target
gis_tutorial_example
example_deprecated_conversion)
if(TARGET ${target})
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
target_link_libraries(${target} PRIVATE CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)
target_link_libraries(${target} PRIVATE CGAL::TBB_support)
endif()
endif()
endforeach()
8 changes: 4 additions & 4 deletions Classification/test/Classification/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ create_single_source_cgal_program("test_classification_point_set.cpp")
create_single_source_cgal_program("test_classification_io.cpp")

foreach(target test_classification_point_set test_classification_io)
target_link_libraries(${target} PUBLIC CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
target_link_libraries(${target} PRIVATE CGAL::Eigen3_support
CGAL::Boost_iostreams_support
CGAL::Boost_serialization_support)
if(TARGET CGAL::TBB_support)
target_link_libraries(${target} PUBLIC CGAL::TBB_support)
target_link_libraries(${target} PRIVATE CGAL::TBB_support)
endif()
endforeach()
8 changes: 4 additions & 4 deletions Combinatorial_map/test/Combinatorial_map/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ create_single_source_cgal_program(Combinatorial_map_copy_test.cpp ${hfiles})

# Same targets, defining USE_COMPACT_CONTAINER_WITH_INDEX to test index version
add_executable(Combinatorial_map_test_index Combinatorial_map_test.cpp ${hfiles})
target_compile_definitions(Combinatorial_map_test_index PUBLIC USE_COMPACT_CONTAINER_WITH_INDEX)
target_link_libraries(Combinatorial_map_test_index PUBLIC CGAL CGAL::Data)
target_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_link_libraries(Combinatorial_map_copy_test_index PUBLIC CGAL CGAL::Data)
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)

create_single_source_cgal_program(cmap_test_split_attribute.cpp)
Expand Down
2 changes: 1 addition & 1 deletion Documentation/doc/Documentation/Developer_manual/create_and_use_a_cmakelist.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ This section describes a minimal example of a program that uses \cgal and Qt6 fo


\skip if(CGAL_Qt6_FOUND)
\until target_link_libraries(draw_surface_mesh PUBLIC CGAL::CGAL_Basic_viewer)
\until target_link_libraries(draw_surface_mesh PRIVATE CGAL::CGAL_Basic_viewer)
\skip endif
\until #end of the file

Expand Down
4 changes: 2 additions & 2 deletions Generalized_map/test/Generalized_map/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
9 changes: 2 additions & 7 deletions Generator/benchmark/Generator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@ find_package(Boost COMPONENTS program_options)
if(Boost_PROGRAM_OPTIONS_FOUND)
create_single_source_cgal_program("random_grid.cpp")
create_single_source_cgal_program("random_disc_2.cpp")
if(TARGET Boost::program_options)
target_link_libraries(random_grid PRIVATE Boost::program_options)
target_link_libraries(random_disc_2 PRIVATE Boost::program_options)
else()
target_link_libraries(random_grid PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
target_link_libraries(random_disc_2 PRIVATE ${Boost_PROGRAM_OPTIONS_LIBRARY})
endif()
target_link_libraries(random_grid PRIVATE Boost::program_options)
target_link_libraries(random_disc_2 PRIVATE Boost::program_options)
else()
message("NOTICE: The benchmarks requires Boost Program Options, and will not be compiled.")
endif()
2 changes: 1 addition & 1 deletion GraphicsView/demo/Alpha_shapes_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Apollonius_graph_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Bounding_volumes/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ endif()
if(CGAL_Qt6_FOUND AND Qt6_FOUND)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Circular_kernel_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(CGAL REQUIRED OPTIONAL_COMPONENTS Qt6)
find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Generator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/GraphicsView/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)

qt_add_executable(min min.cpp)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/L1_Voronoi_diagram_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ include_directories(BEFORE ./include)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Largest_empty_rect_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Periodic_2_triangulation_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ include_directories(BEFORE ./include)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)

Expand Down
4 changes: 2 additions & 2 deletions GraphicsView/demo/Polygon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ endif()
find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)

if(CGAL_Core_FOUND)
add_definitions(-DCGAL_USE_CORE)
add_compile_definitions(-DCGAL_USE_CORE)
endif()

qt_add_executable(Polygon_2 Polygon_2.cpp
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Segment_Delaunay_graph_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)


qt_add_executable(
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Segment_Delaunay_graph_Linf_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)

qt_add_executable(
Segment_voronoi_linf_2 Segment_voronoi_linf_2.cpp
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Snap_rounding_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if(CGAL_Qt6_FOUND AND Qt6_FOUND)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)

qt_add_executable(
Snap_rounding_2 Snap_rounding_2.cpp
Expand Down
2 changes: 1 addition & 1 deletion GraphicsView/demo/Spatial_searching_2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ find_package(Qt6 QUIET COMPONENTS Widgets)

if(CGAL_Qt6_FOUND AND Qt6_FOUND)

add_definitions(-DQT_NO_KEYWORDS)
add_compile_definitions(-DQT_NO_KEYWORDS)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
Expand Down
Loading