kopia lustrzana https://github.com/OpenDroneMap/ODM
try to fix GDAL library linking
Nathan
rodzic
8efaa90f45
commit
38b916e78f
|
|
@ -96,7 +96,7 @@ if (WIN32)
|
|||
|
||||
# Use the GDAL version that comes with pip
|
||||
set(GDAL_ROOT "${PYTHON_HOME}/Lib/site-packages/osgeo")
|
||||
set(GDAL_LIBRARY "${GDAL_ROOT}/lib/gdal_i.lib")
|
||||
set(GDAL_LIBRARY "${GDAL_ROOT}/lib/gdal.lib")
|
||||
set(GDAL_INCLUDE_DIR "${GDAL_ROOT}/include/gdal")
|
||||
|
||||
message("Copying VCPKG DLLs...")
|
||||
|
|
@ -156,121 +156,121 @@ SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
|
|||
# ---------------------------------------------------------------------------------------------
|
||||
# Hexer
|
||||
#
|
||||
# SETUP_EXTERNAL_PROJECT(Hexer 1.5 ON)
|
||||
SETUP_EXTERNAL_PROJECT(Hexer 1.5 ON)
|
||||
|
||||
# # ---------------------------------------------------------------------------------------------
|
||||
# # Open Structure from Motion (OpenSfM)
|
||||
# #
|
||||
# ---------------------------------------------------------------------------------------------
|
||||
# Open Structure from Motion (OpenSfM)
|
||||
#
|
||||
|
||||
# set(custom_libs OpenSfM
|
||||
# LASzip
|
||||
# PDAL
|
||||
# PDALPython
|
||||
# Untwine
|
||||
# Entwine
|
||||
# MvsTexturing
|
||||
# OpenMVS
|
||||
# FPCFilter
|
||||
# PyPopsift
|
||||
# Obj2Tiles
|
||||
# OpenPointClass
|
||||
# ExifTool
|
||||
# RenderDEM
|
||||
# )
|
||||
set(custom_libs OpenSfM
|
||||
LASzip
|
||||
PDAL
|
||||
PDALPython
|
||||
Untwine
|
||||
Entwine
|
||||
MvsTexturing
|
||||
OpenMVS
|
||||
FPCFilter
|
||||
PyPopsift
|
||||
Obj2Tiles
|
||||
OpenPointClass
|
||||
ExifTool
|
||||
RenderDEM
|
||||
)
|
||||
|
||||
# externalproject_add(mve
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/mve.git
|
||||
# GIT_TAG 356
|
||||
# UPDATE_COMMAND ""
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/mve
|
||||
# CMAKE_ARGS ${WIN32_CMAKE_ARGS} ${APPLE_CMAKE_ARGS}
|
||||
# BUILD_IN_SOURCE 1
|
||||
# INSTALL_COMMAND ""
|
||||
# )
|
||||
externalproject_add(mve
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/mve.git
|
||||
GIT_TAG 356
|
||||
UPDATE_COMMAND ""
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/mve
|
||||
CMAKE_ARGS ${WIN32_CMAKE_ARGS} ${APPLE_CMAKE_ARGS}
|
||||
BUILD_IN_SOURCE 1
|
||||
INSTALL_COMMAND ""
|
||||
)
|
||||
|
||||
# foreach(lib ${custom_libs})
|
||||
# SETUP_EXTERNAL_PROJECT_CUSTOM(${lib})
|
||||
# endforeach()
|
||||
foreach(lib ${custom_libs})
|
||||
SETUP_EXTERNAL_PROJECT_CUSTOM(${lib})
|
||||
endforeach()
|
||||
|
||||
# include(ProcessorCount)
|
||||
# ProcessorCount(nproc)
|
||||
include(ProcessorCount)
|
||||
ProcessorCount(nproc)
|
||||
|
||||
# if (WIN32)
|
||||
# set (POISSON_BUILD_CMD ${CMAKE_MAKE_PROGRAM} ${SB_SOURCE_DIR}/PoissonRecon/PoissonRecon.vcxproj /p:configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:PlatformToolset=${CMAKE_VS_PLATFORM_TOOLSET} /p:WindowsTargetPlatformVersion=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
|
||||
# set (POISSON_BIN_PATH "x64/${CMAKE_BUILD_TYPE}/PoissonRecon.exe")
|
||||
# else()
|
||||
# set (POISSON_BUILD_CMD make -j${nproc} poissonrecon)
|
||||
# set (POISSON_BIN_PATH "Linux/PoissonRecon")
|
||||
# if (APPLE)
|
||||
# set(POISSON_BUILD_CMD COMPILER=${CMAKE_CXX_COMPILER} make -j${nproc} -f Makefile.macos poissonrecon)
|
||||
# endif()
|
||||
# endif()
|
||||
# externalproject_add(poissonrecon
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/PoissonRecon.git
|
||||
# GIT_TAG 290
|
||||
# PREFIX ${SB_BINARY_DIR}/PoissonRecon
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/PoissonRecon
|
||||
# UPDATE_COMMAND ""
|
||||
# CONFIGURE_COMMAND ""
|
||||
# BUILD_IN_SOURCE 1
|
||||
# BUILD_COMMAND ${POISSON_BUILD_CMD}
|
||||
# INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${SB_SOURCE_DIR}/PoissonRecon/Bin/${POISSON_BIN_PATH} ${SB_INSTALL_DIR}/bin
|
||||
# )
|
||||
if (WIN32)
|
||||
set (POISSON_BUILD_CMD ${CMAKE_MAKE_PROGRAM} ${SB_SOURCE_DIR}/PoissonRecon/PoissonRecon.vcxproj /p:configuration=${CMAKE_BUILD_TYPE} /p:Platform=x64 /p:PlatformToolset=${CMAKE_VS_PLATFORM_TOOLSET} /p:WindowsTargetPlatformVersion=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION})
|
||||
set (POISSON_BIN_PATH "x64/${CMAKE_BUILD_TYPE}/PoissonRecon.exe")
|
||||
else()
|
||||
set (POISSON_BUILD_CMD make -j${nproc} poissonrecon)
|
||||
set (POISSON_BIN_PATH "Linux/PoissonRecon")
|
||||
if (APPLE)
|
||||
set(POISSON_BUILD_CMD COMPILER=${CMAKE_CXX_COMPILER} make -j${nproc} -f Makefile.macos poissonrecon)
|
||||
endif()
|
||||
endif()
|
||||
externalproject_add(poissonrecon
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/PoissonRecon.git
|
||||
GIT_TAG 290
|
||||
PREFIX ${SB_BINARY_DIR}/PoissonRecon
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/PoissonRecon
|
||||
UPDATE_COMMAND ""
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_IN_SOURCE 1
|
||||
BUILD_COMMAND ${POISSON_BUILD_CMD}
|
||||
INSTALL_COMMAND ${CMAKE_COMMAND} -E copy ${SB_SOURCE_DIR}/PoissonRecon/Bin/${POISSON_BIN_PATH} ${SB_INSTALL_DIR}/bin
|
||||
)
|
||||
|
||||
# externalproject_add(dem2mesh
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/dem2mesh.git
|
||||
# GIT_TAG 334
|
||||
# PREFIX ${SB_BINARY_DIR}/dem2mesh
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/dem2mesh
|
||||
# CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
# ${WIN32_GDAL_ARGS}
|
||||
# ${APPLE_CMAKE_ARGS}
|
||||
# )
|
||||
externalproject_add(dem2mesh
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/dem2mesh.git
|
||||
GIT_TAG 334
|
||||
PREFIX ${SB_BINARY_DIR}/dem2mesh
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/dem2mesh
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
${WIN32_GDAL_ARGS}
|
||||
${APPLE_CMAKE_ARGS}
|
||||
)
|
||||
|
||||
# externalproject_add(dem2points
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/dem2points.git
|
||||
# GIT_TAG master
|
||||
# PREFIX ${SB_BINARY_DIR}/dem2points
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/dem2points
|
||||
# CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
# ${WIN32_GDAL_ARGS}
|
||||
# ${APPLE_CMAKE_ARGS}
|
||||
# )
|
||||
externalproject_add(dem2points
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/dem2points.git
|
||||
GIT_TAG master
|
||||
PREFIX ${SB_BINARY_DIR}/dem2points
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/dem2points
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
${WIN32_GDAL_ARGS}
|
||||
${APPLE_CMAKE_ARGS}
|
||||
)
|
||||
|
||||
# externalproject_add(odm_orthophoto
|
||||
# DEPENDS opencv
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git
|
||||
# GIT_TAG 355
|
||||
# PREFIX ${SB_BINARY_DIR}/odm_orthophoto
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto
|
||||
# CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
# ${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
|
||||
# )
|
||||
externalproject_add(odm_orthophoto
|
||||
DEPENDS opencv
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/odm_orthophoto.git
|
||||
GIT_TAG 355
|
||||
PREFIX ${SB_BINARY_DIR}/odm_orthophoto
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/odm_orthophoto
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
|
||||
)
|
||||
|
||||
# externalproject_add(fastrasterfilter
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/FastRasterFilter.git
|
||||
# GIT_TAG main
|
||||
# PREFIX ${SB_BINARY_DIR}/fastrasterfilter
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/fastrasterfilter
|
||||
# CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
# ${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
|
||||
# )
|
||||
externalproject_add(fastrasterfilter
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/FastRasterFilter.git
|
||||
GIT_TAG main
|
||||
PREFIX ${SB_BINARY_DIR}/fastrasterfilter
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/fastrasterfilter
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
${WIN32_CMAKE_ARGS} ${WIN32_GDAL_ARGS}
|
||||
)
|
||||
|
||||
# externalproject_add(lastools
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/LAStools.git
|
||||
# GIT_TAG 250
|
||||
# PREFIX ${SB_BINARY_DIR}/lastools
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/lastools
|
||||
# CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
# )
|
||||
externalproject_add(lastools
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/LAStools.git
|
||||
GIT_TAG 250
|
||||
PREFIX ${SB_BINARY_DIR}/lastools
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/lastools
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
)
|
||||
|
||||
# externalproject_add(draco
|
||||
# GIT_REPOSITORY https://github.com/OpenDroneMap/draco
|
||||
# GIT_SHALLOW ON
|
||||
# GIT_TAG 915105aef5d0e0fbebc5a98238cfda10f06e61b9
|
||||
# PREFIX ${SB_BINARY_DIR}/draco
|
||||
# SOURCE_DIR ${SB_SOURCE_DIR}/draco
|
||||
# CMAKE_ARGS -DDRACO_TRANSCODER_SUPPORTED=ON
|
||||
# -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
# ${WIN32_CMAKE_ARGS}
|
||||
# )
|
||||
externalproject_add(draco
|
||||
GIT_REPOSITORY https://github.com/OpenDroneMap/draco
|
||||
GIT_SHALLOW ON
|
||||
GIT_TAG 915105aef5d0e0fbebc5a98238cfda10f06e61b9
|
||||
PREFIX ${SB_BINARY_DIR}/draco
|
||||
SOURCE_DIR ${SB_SOURCE_DIR}/draco
|
||||
CMAKE_ARGS -DDRACO_TRANSCODER_SUPPORTED=ON
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
|
||||
${WIN32_CMAKE_ARGS}
|
||||
)
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue