songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More remaining xml

This commit is contained in:
Maxime Gimeno 2021-02-10 13:43:25 +01:00
parent 0e4345741c
commit 08ea69f57c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Installation/cmake/modules/CGAL_SetupCGAL_Qt5Dependencies.cmake
View File

@ -24,7 +24,7 @@ set(CGAL_SetupCGAL_Qt5Dependencies_included TRUE)
# Used Modules # Used Modules
# ^^^^^^^^^^^^ # ^^^^^^^^^^^^
# - :module:`Qt5Config` # - :module:`Qt5Config`
find_package(Qt5 QUIET COMPONENTS OpenGL Svg Xml) find_package(Qt5 QUIET COMPONENTS OpenGL Svg)
set(CGAL_Qt5_MISSING_DEPS "") set(CGAL_Qt5_MISSING_DEPS "")
if(NOT Qt5OpenGL_FOUND) if(NOT Qt5OpenGL_FOUND)
@ -75,7 +75,7 @@ if(NOT CGAL_Qt5_MISSING_DEPS)
POSITION_INDEPENDENT_CODE TRUE POSITION_INDEPENDENT_CODE TRUE
EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_ALL TRUE
AUTOMOC TRUE) AUTOMOC TRUE)
target_link_libraries(CGAL_Qt5_moc_and_resources CGAL::CGAL Qt5::Widgets Qt5::OpenGL Qt5::Svg Qt5::Xml) target_link_libraries(CGAL_Qt5_moc_and_resources CGAL::CGAL Qt5::Widgets Qt5::OpenGL Qt5::Svg )
add_library(CGAL::CGAL_Qt5_moc_and_resources ALIAS CGAL_Qt5_moc_and_resources) add_library(CGAL::CGAL_Qt5_moc_and_resources ALIAS CGAL_Qt5_moc_and_resources)
add_library(CGAL::Qt5_moc_and_resources ALIAS CGAL_Qt5_moc_and_resources) add_library(CGAL::Qt5_moc_and_resources ALIAS CGAL_Qt5_moc_and_resources)
@ -112,7 +112,7 @@ function(CGAL_setup_CGAL_Qt5_dependencies target)
endif() endif()
target_link_libraries( ${target} INTERFACE CGAL::CGAL) target_link_libraries( ${target} INTERFACE CGAL::CGAL)
target_link_libraries( ${target} INTERFACE CGAL::Qt5_moc_and_resources) target_link_libraries( ${target} INTERFACE CGAL::Qt5_moc_and_resources)
target_link_libraries( ${target} INTERFACE Qt5::OpenGL Qt5::Svg Qt5::Xml) target_link_libraries( ${target} INTERFACE Qt5::OpenGL Qt5::Svg )
# Remove -Wdeprecated-copy, for g++ >= 9.0, because Qt5, as of # Remove -Wdeprecated-copy, for g++ >= 9.0, because Qt5, as of
# version 5.12, has a lot of [-Wdeprecated-copy] warnings. # version 5.12, has a lot of [-Wdeprecated-copy] warnings.

2
Polyhedron/demo/Polyhedron/CMakeLists.txt
View File

@ -216,7 +216,7 @@ if(CGAL_Qt5_FOUND AND Qt5_FOUND)
Primitive_container.cpp Primitive_container.cpp
Polyhedron_demo_plugin_helper.cpp Polyhedron_demo_plugin_helper.cpp
CGAL_double_edit.cpp) CGAL_double_edit.cpp)
target_link_libraries(demo_framework PUBLIC Qt5::OpenGL Qt5::Widgets Qt5::Gui Qt5::Xml target_link_libraries(demo_framework PUBLIC Qt5::OpenGL Qt5::Widgets Qt5::Gui
Qt5::Script CGAL::CGAL_Qt5) Qt5::Script CGAL::CGAL_Qt5)
if(TARGET Qt5::WebSockets) if(TARGET Qt5::WebSockets)
target_link_libraries(demo_framework PUBLIC Qt5::WebSockets) target_link_libraries(demo_framework PUBLIC Qt5::WebSockets)