kopia lustrzana https://github.com/OpenDroneMap/ODM
Upgrade PDAL, compile PDAL's python bindings
rodzic
054a4414a1
commit
4cf7f159b7
|
@ -159,6 +159,7 @@ SETUP_EXTERNAL_PROJECT(Hexer 1.4 ON)
|
||||||
set(custom_libs OpenSfM
|
set(custom_libs OpenSfM
|
||||||
LASzip
|
LASzip
|
||||||
PDAL
|
PDAL
|
||||||
|
PDALPython
|
||||||
Untwine
|
Untwine
|
||||||
Entwine
|
Entwine
|
||||||
MvsTexturing
|
MvsTexturing
|
||||||
|
|
|
@ -16,7 +16,7 @@ ExternalProject_Add(${_proj_name}
|
||||||
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
||||||
#--Download step--------------
|
#--Download step--------------
|
||||||
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
||||||
URL https://github.com/PDAL/PDAL/archive/refs/tags/2.3RC1.zip
|
URL https://github.com/PDAL/PDAL/archive/refs/tags/2.4.3.zip
|
||||||
#--Update/Patch step----------
|
#--Update/Patch step----------
|
||||||
UPDATE_COMMAND ""
|
UPDATE_COMMAND ""
|
||||||
#--Configure step-------------
|
#--Configure step-------------
|
||||||
|
@ -60,3 +60,4 @@ ExternalProject_Add(${_proj_name}
|
||||||
LOG_CONFIGURE OFF
|
LOG_CONFIGURE OFF
|
||||||
LOG_BUILD OFF
|
LOG_BUILD OFF
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,30 @@
|
||||||
|
set(_proj_name pdal-python)
|
||||||
|
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")
|
||||||
|
|
||||||
|
ExternalProject_Add(${_proj_name}
|
||||||
|
DEPENDS pdal
|
||||||
|
PREFIX ${_SB_BINARY_DIR}
|
||||||
|
TMP_DIR ${_SB_BINARY_DIR}/tmp
|
||||||
|
STAMP_DIR ${_SB_BINARY_DIR}/stamp
|
||||||
|
#--Download step--------------
|
||||||
|
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
|
||||||
|
GIT_REPOSITORY https://github.com/OpenDroneMap/pdal-python
|
||||||
|
GIT_TAG main
|
||||||
|
#--Update/Patch step----------
|
||||||
|
UPDATE_COMMAND ""
|
||||||
|
#--Configure step-------------
|
||||||
|
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
|
||||||
|
CMAKE_ARGS
|
||||||
|
-DPDAL_DIR=${SB_INSTALL_DIR}/lib/cmake/PDAL
|
||||||
|
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
|
||||||
|
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}/lib/python3.8/dist-packages
|
||||||
|
${WIN32_CMAKE_ARGS}
|
||||||
|
#--Build step-----------------
|
||||||
|
BINARY_DIR ${_SB_BINARY_DIR}
|
||||||
|
#--Install step---------------
|
||||||
|
INSTALL_DIR ${SB_INSTALL_DIR}
|
||||||
|
#--Output logging-------------
|
||||||
|
LOG_DOWNLOAD OFF
|
||||||
|
LOG_CONFIGURE OFF
|
||||||
|
LOG_BUILD OFF
|
||||||
|
)
|
|
@ -14,7 +14,7 @@ python_packages_paths = [os.path.join(superbuild_path, p) for p in [
|
||||||
'install/lib/python3.9/dist-packages',
|
'install/lib/python3.9/dist-packages',
|
||||||
'install/lib/python3.8/dist-packages',
|
'install/lib/python3.8/dist-packages',
|
||||||
'install/lib/python3/dist-packages',
|
'install/lib/python3/dist-packages',
|
||||||
'install/bin/opensfm'
|
'install/bin/opensfm',
|
||||||
]]
|
]]
|
||||||
for p in python_packages_paths:
|
for p in python_packages_paths:
|
||||||
sys.path.append(p)
|
sys.path.append(p)
|
||||||
|
|
Ładowanie…
Reference in New Issue