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

Try to fix link issues with qt6 resources #7915

Merged
merged 8 commits into from
Jan 19, 2024
Merged

Try to fix link issues with qt6 resources #7915

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
410ead5
also look for Basic viewer in targets
sloriot Dec 6, 2023
31d66c3
Fix display of Qt version
lrineau Dec 7, 2023
ad8ad2d
display Qt6 version in the test results page
lrineau Dec 7, 2023
811f78c
fix the bug about CGAL_Qt6_moc_and_resources_Fixture
lrineau Dec 7, 2023
aeda27f
"compilation of demo_framework" should be in the Installation packag…
lrineau Jan 9, 2024
1f26c03
plugins should not depend on `Polyhedron_3`
lrineau Jan 10, 2024
2ccb65f
Revert "plugins should not depend on `Polyhedron_3`"
lrineau Jan 11, 2024
1491b75
If CGAL_TEST_SUITE, then plugins do not depend on Polyhedron_3
lrineau Jan 11, 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
5 changes: 2 additions & 3 deletions Installation/cmake/modules/CGAL_add_test.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,8 @@ function(cgal_add_compilation_test exe_name)
if(TARGET CGAL_Qt6_moc_and_resources) # if CGAL_Qt6 was searched, and is header-only
get_property(linked_libraries TARGET "${exe_name}" PROPERTY LINK_LIBRARIES)
# message(STATUS "${exe_name} depends on ${linked_libraries}")
string(FIND "${linked_libraries}" "CGAL::CGAL_Qt6" link_with_CGAL_Qt6)
if(link_with_CGAL_Qt6 STRGREATER "-1" AND
NOT TARGET "compilation_of__CGAL_Qt6_moc_and_resources")
if( ("CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Qt6" IN_LIST linked_libraries OR "CGAL::CGAL_Basic_viewer" IN_LIST linked_libraries)
AND NOT TARGET "compilation_of__CGAL_Qt6_moc_and_resources")
# This custom target is useless. It is used only as a flag to
# detect that the test has already been created.
add_custom_target("compilation_of__CGAL_Qt6_moc_and_resources")
Expand Down
4 changes: 2 additions & 2 deletions Installation/cmake/modules/CGAL_enable_end_of_configuration_hook.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This module install a hook (with `variable_watch()`) on CMAKE_CURRENT_LIST_DIR
#
#
# That uses the non-documented fact that CMAKE_CURRENT_LIST_DIR is cleared
# by CMake at the end of the configuration process. So, if the value of
# that variable gets empty, that means that CMake has reached the end of
Expand Down Expand Up @@ -110,7 +110,7 @@ function(CGAL_hook_fix_ctest_depending_on_Qt6)
continue()
endif()
get_property(_target_links TARGET ${_target} PROPERTY LINK_LIBRARIES)
if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links)
if("CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Qt6" IN_LIST _target_links OR "CGAL::CGAL_Basic_viewer" IN_LIST _target_links)
set_property(TEST "compilation of ${_target}" APPEND PROPERTY FIXTURES_REQUIRED CGAL_Qt6_moc_and_resources_Fixture)
endif()
endforeach()
Expand Down