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

Merge pull request #8474 from soesau/PSP3-LAStools_msvc2017-GF 

[LASlib] Prevent usage of LASlib with msvc 2017
This commit is contained in:
Sébastien Loriot 2024-09-09 18:00:03 +02:00
parent 2672006cae 19372fe0d1
commit 9472bf46a4
3 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -67,17 +67,23 @@ foreach(
target_link_libraries(${target} PRIVATE ${CGAL_libs})
endforeach()
find_package(LASLIB)
include(CGAL_LASLIB_support)
if(TARGET CGAL::LASLIB_support)
create_single_source_cgal_program("read_las_example.cpp")
create_single_source_cgal_program("write_las_example.cpp")
target_link_libraries(read_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
target_link_libraries(write_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
#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)
create_single_source_cgal_program("read_las_example.cpp")
create_single_source_cgal_program("write_las_example.cpp")
target_link_libraries(read_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
target_link_libraries(write_las_example PRIVATE ${CGAL_libs} CGAL::LASLIB_support)
else()
message(
STATUS
"NOTICE : the LAS reader test requires LASlib and will not be compiled.")
endif()
else()
message(
STATUS
"NOTICE : the LAS reader test requires LASlib and will not be compiled.")
message(STATUS "NOTICE : the LAS reader does not work with your version of Visual Studio 2017.")
endif()
# Use Eigen

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

@ -1,12 +1,16 @@
include(polyhedron_demo_macros)
find_package(LASLIB)
set_package_properties(
LASLIB PROPERTIES
DESCRIPTION "A library for some I/O."
PURPOSE "Requiered for reading or writing LAS files.")
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()
include(CGAL_LASLIB_support)
polyhedron_demo_plugin(gocad_plugin GOCAD_io_plugin KEYWORDS Viewer)
target_link_libraries(gocad_plugin PUBLIC scene_surface_mesh_item)

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

@ -13,8 +13,12 @@ find_library(
NAMES 3MF
DOC "Path to the lib3MF library")
find_package(LASLIB QUIET)
include(CGAL_LASLIB_support)
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(