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

Prevent usage of LASlib with msvc 2017

This commit is contained in:
Sven Oesau 2024-09-09 16:17:40 +02:00
parent a27d129698
commit cc2bec0a96
3 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,6 +67,9 @@ foreach(
target_link_libraries(${target} PRIVATE ${CGAL_libs})
endforeach()
#disable if MSVC 2017
if(NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910)
find_package(LASLIB)
include(CGAL_LASLIB_support)
if (TARGET CGAL::LASLIB_support)
@ -79,6 +82,9 @@ else()
STATUS
"NOTICE : the LAS reader test requires LASlib and will not be compiled.")
endif()
else()
message(STATUS "NOTICE : the LAS reader does not work with your version of Visual Studio 2017.")
endif()
# Use Eigen
find_package(Eigen3 3.1.0) #(requires 3.1.0 or greater)

7
Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
View File

@ -1,12 +1,16 @@
include(polyhedron_demo_macros)
if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910)
find_package(LASLIB)
set_package_properties(
LASLIB PROPERTIES
DESCRIPTION "A library for some I/O."
PURPOSE "Requiered for reading or writing LAS files.")
include(CGAL_LASLIB_support)
else()
message(STATUS "NOTICE : the LAS reader does not work with your version of Visual Studio 2017.")
endif()
polyhedron_demo_plugin(gocad_plugin GOCAD_io_plugin KEYWORDS Viewer)
target_link_libraries(gocad_plugin PUBLIC scene_surface_mesh_item)
@ -103,6 +107,7 @@ else()
target_link_libraries(ply_plugin PUBLIC scene_points_with_normal_item scene_polygon_soup_item scene_surface_mesh_item scene_textured_item)
target_compile_features(ply_plugin PRIVATE ${needed_cxx_features})
#disable if MSVC 2017
if (TARGET CGAL::LASLIB_support)
polyhedron_demo_plugin(las_plugin LAS_io_plugin KEYWORDS Viewer PointSetProcessing Classification)
target_link_libraries(las_plugin PUBLIC scene_points_with_normal_item CGAL::LASLIB_support)

5
Stream_support/test/Stream_support/CMakeLists.txt
View File

@ -13,8 +13,12 @@ find_library(
NAMES 3MF
DOC "Path to the lib3MF library")
if (NOT MSVC_VERSION OR MSVC_VERSION GREATER_EQUAL 1919 OR MSVC_VERSION LESS 1910)
find_package(LASLIB QUIET)
include(CGAL_LASLIB_support)
else()
message(STATUS "NOTICE : the LAS reader does not work with your version of Visual Studio 2017.")
endif()
# create a target per cppfile
file(
@ -37,6 +41,7 @@ foreach(cppfile ${cppfiles})
endif()
else()
if("${cppfile}" STREQUAL "test_LAS.cpp")
#disable if MSVC 2017
if(TARGET CGAL::LASLIB_support)
create_single_source_cgal_program("test_LAS.cpp")
target_link_libraries(test_LAS PRIVATE CGAL::LASLIB_support)