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

[LASlib] Prevent usage of LASlib with msvc 2017 #8474

Merged
merged 2 commits into from
Sep 9, 2024
Merged

[LASlib] Prevent usage of LASlib with msvc 2017 #8474

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc2bec0
Prevent usage of LASlib with msvc 2017
soesau Sep 9, 2024
19372fe
fix comment
sloriot Sep 9, 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
26 changes: 16 additions & 10 deletions Point_set_processing_3/examples/Point_set_processing_3/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 11 additions & 6 deletions Polyhedron/demo/Polyhedron/Plugins/IO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#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)
Expand Down
9 changes: 7 additions & 2 deletions Stream_support/test/Stream_support/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -37,6 +41,7 @@ foreach(cppfile ${cppfiles})
endif()
else()
if("${cppfile}" STREQUAL "test_LAS.cpp")
#disable if MSVC 2017
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#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)
Expand Down