Skip to content

Commit df6f4cb

Browse files
longhuan2018a17r
authored andcommitted
Use PDAL instead of liblas
1 parent 43faf6f commit df6f4cb

File tree

4 files changed

+209
-200
lines changed

4 files changed

+209
-200
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ ELSE()
782782
ENDIF()
783783
FIND_PACKAGE(ZeroConf)
784784

785-
FIND_PACKAGE(LIBLAS)
785+
FIND_PACKAGE(PDAL CONFIG)
786786

787787
IF (NOT(OSG_USE_LOCAL_LUA_SOURCE))
788788
FIND_PACKAGE(Lua52)

src/osgPlugins/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ ADD_PLUGIN_DIRECTORY(osc)
272272
ADD_PLUGIN_DIRECTORY(trk)
273273
ADD_PLUGIN_DIRECTORY(tf)
274274

275-
IF(LIBLAS_FOUND)
275+
IF(PDAL_FOUND)
276276
ADD_PLUGIN_DIRECTORY(las)
277277
ENDIF()
278278

src/osgPlugins/las/CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
INCLUDE_DIRECTORIES(${LIBLAS_INCLUDE_DIR})
2-
INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
1+
INCLUDE_DIRECTORIES(${PDAL_INCLUDE_DIRS})
2+
3+
ADD_DEFINITIONS(-DNOMINMAX)
34

45
SET(TARGET_SRC ReaderWriterLAS.cpp )
56

6-
SET(TARGET_LIBRARIES_VARS LIBLAS_LIBRARY LIBLASC_LIBRARY)
7+
SET(TARGET_LIBRARIES_VARS PDAL_LIBRARIES)
78

89
#### end var setup ###
910
SETUP_PLUGIN(las)

0 commit comments

Comments
 (0)