Skip to content

Commit ee07e81

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

File tree

5 files changed

+315
-200
lines changed

5 files changed

+315
-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)
786786

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

CMakeModules/FindPDAL.cmake

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
#---
2+
# File: FindPDAL.cmake
3+
#
4+
# Find the native PDAL includes and library
5+
#
6+
# PDAL_INCLUDE_DIRS - where to find pdal's includes.
7+
# PDAL_LIBRARIES - List of libraries when using pdal.
8+
# PDAL_FOUND - True if pdal found.
9+
#---
10+
11+
12+
# Set the include dir:
13+
find_path(PDAL_INCLUDE_DIR pdal/pdal.hpp)
14+
find_path(LASZIP_INCLUDE_DIR laszip/laszip_api.h)
15+
16+
# Macro for setting libraries:
17+
macro(FIND_PDAL_LIBRARY MYLIBRARY MYLIBRARYNAME)
18+
19+
find_library(
20+
"${MYLIBRARY}_DEBUG"
21+
NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
22+
PATHS
23+
${PDAL_DIR}/lib/Debug
24+
${PDAL_DIR}/lib64/Debug
25+
${PDAL_DIR}/lib
26+
${PDAL_DIR}/lib64
27+
$ENV{PDAL_DIR}/lib/debug
28+
$ENV{PDAL_DIR}/lib64/debug
29+
NO_DEFAULT_PATH
30+
)
31+
32+
find_library(
33+
"${MYLIBRARY}_DEBUG"
34+
NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
35+
PATHS
36+
~/Library/Frameworks
37+
/Library/Frameworks
38+
/usr/local/lib
39+
/usr/local/lib64
40+
/usr/lib
41+
/usr/lib64
42+
/sw/lib
43+
/opt/local/lib
44+
/opt/csw/lib
45+
/opt/lib
46+
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;PDAL_ROOT]/lib
47+
/usr/freeware/lib64
48+
)
49+
50+
find_library(
51+
${MYLIBRARY}
52+
NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
53+
PATHS
54+
${PDAL_DIR}/lib/Release
55+
${PDAL_DIR}/lib64/Release
56+
${PDAL_DIR}/lib
57+
${PDAL_DIR}/lib64
58+
$ENV{PDAL_DIR}/lib/Release
59+
$ENV{PDAL_DIR}/lib64/Release
60+
$ENV{PDAL_DIR}/lib
61+
$ENV{PDAL_DIR}/lib64
62+
$ENV{PDAL_DIR}
63+
$ENV{PDALDIR}/lib
64+
$ENV{PDALDIR}/lib64
65+
$ENV{PDALDIR}
66+
$ENV{PDAL_ROOT}/lib
67+
$ENV{PDAL_ROOT}/lib64
68+
NO_DEFAULT_PATH
69+
)
70+
71+
find_library(
72+
${MYLIBRARY}
73+
NAMES "${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}" "lib${MYLIBRARYNAME}${CMAKE_RELEASE_POSTFIX}"
74+
PATHS
75+
~/Library/Frameworks
76+
/Library/Frameworks
77+
/usr/local/lib
78+
/usr/local/lib64
79+
/usr/lib
80+
/usr/lib64
81+
/sw/lib
82+
/opt/local/lib
83+
/opt/csw/lib
84+
/opt/lib
85+
[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;PDAL_ROOT]/lib
86+
/usr/freeware/lib64
87+
)
88+
89+
if( NOT ${MYLIBRARY}_DEBUG )
90+
if( MYLIBRARY )
91+
set( ${MYLIBRARY}_DEBUG ${MYLIBRARY} )
92+
endif(MYLIBRARY)
93+
endif( NOT ${MYLIBRARY}_DEBUG )
94+
95+
endmacro(FIND_PDAL_LIBRARY LIBRARY LIBRARYNAME)
96+
97+
FIND_PDAL_LIBRARY(PDALCPP_LIBRARY pdalcpp)
98+
set(PDAL_FOUND "NO")
99+
if(WIN32)
100+
FIND_PDAL_LIBRARY(PDALUTIL_LIBRARY pdal_util)
101+
if(PDALCPP_LIBRARY AND PDALUTIL_LIBRARY AND PDAL_INCLUDE_DIR)
102+
set(PDAL_INCLUDE_DIRS ${PDAL_INCLUDE_DIR} ${LASZIP_INCLUDE_DIR})
103+
set(PDAL_LIBRARIES ${PDALCPP_LIBRARY} ${PDALUTIL_LIBRARY} )
104+
set(PDAL_FOUND "YES")
105+
endif()
106+
else(WIN32)
107+
if(PDALCPP_LIBRARY AND PDAL_INCLUDE_DIR)
108+
set(PDAL_INCLUDE_DIRS ${PDAL_INCLUDE_DIR} ${LASZIP_INCLUDE_DIR})
109+
set(PDAL_LIBRARIES ${PDALCPP_LIBRARY} )
110+
set(PDAL_FOUND "YES")
111+
endif()
112+
endif(WIN32)

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)