Skip to content

Use PDAL instead of liblas #33

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

Open
wants to merge 2 commits into
base: 3.6
Choose a base branch
from
Open

Use PDAL instead of liblas #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df6f4cb
Use PDAL instead of liblas
longhuan2018 Sep 28, 2021
c2b4b57
Remove unused FindLIBLAS.cmake
longhuan2018 Sep 28, 2021
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,7 @@ ELSE()
ENDIF()
FIND_PACKAGE(ZeroConf)

FIND_PACKAGE(LIBLAS)
FIND_PACKAGE(PDAL CONFIG)

IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
FIND_PACKAGE(Lua52)
Expand Down
108 changes: 0 additions & 108 deletions CMakeModules/FindLIBLAS.cmake
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/osgPlugins/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ ADD_PLUGIN_DIRECTORY(osc)
ADD_PLUGIN_DIRECTORY(trk)
ADD_PLUGIN_DIRECTORY(tf)

IF(LIBLAS_FOUND)
IF(PDAL_FOUND)
ADD_PLUGIN_DIRECTORY(las)
ENDIF()

Expand Down
7 changes: 4 additions & 3 deletions src/osgPlugins/las/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
INCLUDE_DIRECTORIES(${LIBLAS_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${PDAL_INCLUDE_DIRS})

ADD_DEFINITIONS(-DNOMINMAX)

SET(TARGET_SRC ReaderWriterLAS.cpp )

SET(TARGET_LIBRARIES_VARS LIBLAS_LIBRARY LIBLASC_LIBRARY)
SET(TARGET_LIBRARIES_VARS PDAL_LIBRARIES)

#### end var setup ###
SETUP_PLUGIN(las)
Loading