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

fixes for latest version of LAStools + be compatible with CONFIG mode 

provided CMAKE_FIND_PACKAGE_PREFER_CONFIG is set to TRUE
This commit is contained in:
Sébastien Loriot 2024-09-03 14:20:20 +02:00
parent e791122b35
commit cb78abd603
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Installation/cmake/modules/CGAL_LASLIB_support.cmake
View File

@ -1,8 +1,19 @@
if(LASLIB_FOUND AND NOT TARGET CGAL::LASLIB_support) if(LASLIB_FOUND)
if (NOT TARGET CGAL::LASLIB_support)
if (NOT TARGET LASlib)
# message(STATUS "Found using MODULE mode")
add_library(CGAL::LASLIB_support INTERFACE IMPORTED) add_library(CGAL::LASLIB_support INTERFACE IMPORTED)
set_target_properties(CGAL::LASLIB_support PROPERTIES set_target_properties(CGAL::LASLIB_support PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "CGAL_LINKED_WITH_LASLIB" INTERFACE_COMPILE_DEFINITIONS "CGAL_LINKED_WITH_LASLIB"
INTERFACE_INCLUDE_DIRECTORIES "${LASLIB_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES "${LASLIB_INCLUDE_DIR}"
INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LASLIB_INCLUDE_DIR}" INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${LASLIB_INCLUDE_DIR}"
INTERFACE_LINK_LIBRARIES "${LASLIB_LIBRARIES}") INTERFACE_LINK_LIBRARIES "${LASLIB_LIBRARIES}")
else()
# message(STATUS "Found using CONFIG mode")
add_library(CGAL::LASLIB_support INTERFACE IMPORTED)
set_target_properties(CGAL::LASLIB_support PROPERTIES
INTERFACE_COMPILE_DEFINITIONS "CGAL_LINKED_WITH_LASLIB")
target_link_libraries(CGAL::LASLIB_support INTERFACE LASlib)
endif()
endif()
endif() endif()

11
Installation/cmake/modules/FindLASLIB.cmake
View File

@ -28,6 +28,17 @@ find_library(LASLIB_LIBRARIES
${LASLIB_INCLUDE_DIR}/../../lib ${LASLIB_INCLUDE_DIR}/../../lib
ENV LASLIB_LIB_DIR ENV LASLIB_LIB_DIR
) )
if (NOT LASLIB_LIBRARIES)
#library was renamed in recent versions of LAStools
find_library(LASLIB_LIBRARIES
NAMES LASlib
PATHS ENV LD_LIBRARY_PATH
ENV LIBRARY_PATH
/usr/local/lib
${LASLIB_INCLUDE_DIR}/../../lib
ENV LASLIB_LIB_DIR
)
endif()
if(LASLIB_LIBRARIES AND LASLIB_INCLUDE_DIR AND LASZIP_INCLUDE_DIR) if(LASLIB_LIBRARIES AND LASLIB_INCLUDE_DIR AND LASZIP_INCLUDE_DIR)
if (NOT ${LASLIB_INCLUDE_DIR} STREQUAL ${LASZIP_INCLUDE_DIR}) if (NOT ${LASLIB_INCLUDE_DIR} STREQUAL ${LASZIP_INCLUDE_DIR})