Fixes when neither LEDA nor GMP is available #7960
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lrineau
reviewed
Jan 4, 2024
Comment on lines
7
to
+14
| find_package(CGAL REQUIRED COMPONENTS Core) | ||
| find_package(LEDA QUIET) | ||
|
|
||
| # create a target per cppfile | ||
| file( | ||
| GLOB cppfiles | ||
| RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} | ||
| ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp) | ||
| foreach(cppfile ${cppfiles}) | ||
| create_single_source_cgal_program("${cppfile}") | ||
| endforeach() | ||
| create_single_source_cgal_program("cones_inexact.cpp") | ||
| create_single_source_cgal_program("theta_inexact.cpp") | ||
| create_single_source_cgal_program("yao_inexact.cpp") | ||
|
|
||
| if(CGAL_Core_FOUND OR LEDA_FOUND) |
There was a problem hiding this comment.
That is strange. find_package(CGAL REQUIRED COMPONENTS Core) should stop the compilation if Core is not found. That is certainly an error in CGALConfig.cmake.
There was a problem hiding this comment.
We can open an independent issue if we want to fix that. OPTIONAL keyword should indeed be used.
This reverts commit 00219bc.
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
Outdated
Show resolved
Hide resolved
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
Outdated
Show resolved
Hide resolved
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test_with_cmake
Outdated
Show resolved
Hide resolved
Comment on lines
+12
to
+37
| create_single_source_cgal_program("issue4533.cpp") | ||
| create_single_source_cgal_program("issue4684.cpp") | ||
| create_single_source_cgal_program("test_sls.cpp") | ||
| create_single_source_cgal_program("test_sls_previous_issues.cpp") | ||
| create_single_source_cgal_program("test_sls_traits.cpp") | ||
| create_single_source_cgal_program("test_straight_skeleton_copy.cpp") | ||
|
|
||
| if(CGAL_Qt6_FOUND) | ||
| target_link_libraries(issue4684 PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(issue7149 PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(issue7284 PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(test_sls_previous_issues PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(test_sls_offset PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(test_sls_weighted_polygons_with_holes PUBLIC CGAL::CGAL_Basic_viewer) | ||
| endif() | ||
|
|
||
| if (CGAL_Core_FOUND OR LEDA_FOUND) | ||
| create_single_source_cgal_program("test_sls_offset.cpp") | ||
| create_single_source_cgal_program("issue7284.cpp") | ||
| create_single_source_cgal_program("test_sls_simple.cpp") | ||
| create_single_source_cgal_program("test_sls_weighted_polygons_with_holes.cpp") | ||
| create_single_source_cgal_program("issue7149.cpp") | ||
| if(CGAL_Qt6_FOUND) | ||
| target_link_libraries(issue7149 PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(issue7284 PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(test_sls_offset PUBLIC CGAL::CGAL_Basic_viewer) | ||
| target_link_libraries(test_sls_weighted_polygons_with_holes PUBLIC CGAL::CGAL_Basic_viewer) | ||
| endif() | ||
| else() | ||
| message("NOTICE: Some test require CGAL_Core (or LEDA), and will not be compiled.") |
There was a problem hiding this comment.
Isn't there a more flexible way possible?
(see e.g. https://github.com/doxygen/doxygen/blob/master/examples/CMakeLists.txt and look for BASIC_EXAMPLES. still a list but a bit more flexible, maybe something is possible here as well...)
sloriot
added
Under Testing
and removed
Batch_2
|
Successfully tested in CGAL-6.0-Ic-147 |
lrineau
added
the
rm only: ready for master
lrineau
added
Under discussion
and removed
rm only: ready for master
|
This pull-request was previously marked with the label |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.