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

Merge pull request #8475 from soesau/PSP3-OpenGR_msvc2015-GF 

[PSP3] OpenGR does not work with msvc2015
This commit is contained in:
Sébastien Loriot 2024-09-09 18:00:01 +02:00
parent a27d129698 cc7ba6ef98
commit 2672006cae
2 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
View File

@ -120,33 +120,38 @@ if(TARGET CGAL::Eigen3_support)
) )
endif() endif()
# Executables that require OpenGR # Executables that require OpenGR
find_package(OpenGR QUIET) if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910)
include(CGAL_OpenGR_support) find_package(OpenGR QUIET)
if(TARGET CGAL::OpenGR_support) include(CGAL_OpenGR_support)
create_single_source_cgal_program("registration_with_OpenGR.cpp") if(TARGET CGAL::OpenGR_support)
target_link_libraries(registration_with_OpenGR PRIVATE ${CGAL_libs} create_single_source_cgal_program("registration_with_OpenGR.cpp")
CGAL::OpenGR_support) target_link_libraries(registration_with_OpenGR PRIVATE ${CGAL_libs}
CGAL::OpenGR_support)
else()
message(
STATUS
"NOTICE : registration_with_OpenGR requires OpenGR, and will not be compiled."
)
endif()
# Executables that require both libpointmatcher and OpenGR
if (TARGET CGAL::pointmatcher_support AND
TARGET CGAL::OpenGR_support)
create_single_source_cgal_program("registration_with_opengr_pointmatcher_pipeline.cpp")
target_link_libraries(
registration_with_opengr_pointmatcher_pipeline PRIVATE ${CGAL_libs}
CGAL::pointmatcher_support CGAL::OpenGR_support)
else()
message(
STATUS
"NOTICE : registration_with_opengr_pointmatcher_pipeline requires libpointmatcher and OpenGR, and will not be compiled."
)
endif()
else() else()
message( message(
STATUS STATUS
"NOTICE : registration_with_OpenGR requires OpenGR, and will not be compiled." "NOTICE : OpenGR does not support your compiler, registration_with_OpenGR will not be compiled."
) )
endif() endif()
# Executables that require both libpointmatcher and OpenGR
if (TARGET CGAL::pointmatcher_support AND
TARGET CGAL::OpenGR_support)
create_single_source_cgal_program("registration_with_opengr_pointmatcher_pipeline.cpp")
target_link_libraries(
registration_with_opengr_pointmatcher_pipeline PRIVATE ${CGAL_libs}
CGAL::pointmatcher_support CGAL::OpenGR_support)
else()
message(
STATUS
"NOTICE : registration_with_opengr_pointmatcher_pipeline requires libpointmatcher and OpenGR, and will not be compiled."
)
endif()
else() else()
message( message(
STATUS STATUS

12
Polyhedron/demo/Polyhedron/Plugins/Point_set/CMakeLists.txt
View File

@ -97,9 +97,15 @@ if(TARGET CGAL::Eigen3_support)
point_set_shape_detection_plugin point_set_shape_detection_plugin
PUBLIC scene_surface_mesh_item scene_points_with_normal_item PUBLIC scene_surface_mesh_item scene_points_with_normal_item
scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support) scene_polygon_soup_item scene_callback_signaler CGAL::Eigen3_support)
if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1910)
find_package(OpenGR QUIET) find_package(OpenGR QUIET)
include(CGAL_OpenGR_support) include(CGAL_OpenGR_support)
else()
message(
STATUS
"NOTICE : OpenGR does not support your compiler."
)
endif()
find_package(libpointmatcher QUIET) find_package(libpointmatcher QUIET)
include(CGAL_pointmatcher_support) include(CGAL_pointmatcher_support)