diff --git a/SuperBuild/cmake/External-PCL.cmake b/SuperBuild/cmake/External-PCL.cmake index ff30e21b..aaf3d485 100644 --- a/SuperBuild/cmake/External-PCL.cmake +++ b/SuperBuild/cmake/External-PCL.cmake @@ -7,14 +7,7 @@ ExternalProject_Add(${_proj_name} STAMP_DIR ${_SB_BINARY_DIR}/stamp #--Download step-------------- DOWNLOAD_DIR ${SB_DOWNLOAD_DIR} - - # PCL 1.8 + Fix for loading large point clouds https://github.com/OpenDroneMap/pcl/commit/924ab1137fbfa3004f222fb0834e3d66881ec057 - URL https://github.com/OpenDroneMap/pcl/archive/master.zip - - #-- TODO: Use PCL 1.9.1 when we upgrade to a newer version of Ubuntu. Currently - #-- it's troublesome to compile due to the older version of Boost shipping with 16.04. - #-- URL https://github.com/PointCloudLibrary/pcl/archive/pcl-1.9.1.tar.gz - + URL https://github.com/PointCloudLibrary/pcl/archive/refs/tags/pcl-1.11.1.zip #--Update/Patch step---------- UPDATE_COMMAND "" #--Configure step------------- @@ -35,6 +28,8 @@ ExternalProject_Add(${_proj_name} -DBUILD_tools=OFF -DBUILD_tracking=OFF -DBUILD_visualization=OFF + -DWITH_OPENGL=OFF + -DWITH_VTK=OFF -DWITH_QT=OFF -DBUILD_OPENNI=OFF -DBUILD_OPENNI2=OFF @@ -47,6 +42,8 @@ ExternalProject_Add(${_proj_name} -DCMAKE_BUILD_TYPE=Release -DPCL_VERBOSITY_LEVEL=Error -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR} + -DPCL_BUILD_WITH_FLANN_DYNAMIC_LINKING_WIN32=ON + ${WIN32_CMAKE_ARGS} #--Build step----------------- BINARY_DIR ${_SB_BINARY_DIR} #--Install step--------------- diff --git a/modules/odm_orthophoto/CMakeLists.txt b/modules/odm_orthophoto/CMakeLists.txt index 68e18ec0..6c8f20e0 100644 --- a/modules/odm_orthophoto/CMakeLists.txt +++ b/modules/odm_orthophoto/CMakeLists.txt @@ -9,7 +9,6 @@ set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the OPENCV inst add_definitions(-Wall -Wextra) # Find pcl at the location specified by PCL_DIR -find_package(VTK 6.0 REQUIRED) find_package(PCL 1.8 HINTS "${PCL_DIR}/share/pcl-1.8" REQUIRED) find_package(GDAL REQUIRED) include_directories(${GDAL_INCLUDE_DIR}) diff --git a/vcpkg-requirements.txt b/vcpkg-requirements.txt index 0fa7a924..6169d542 100644 --- a/vcpkg-requirements.txt +++ b/vcpkg-requirements.txt @@ -5,4 +5,13 @@ tbb zlib libpng libjpeg-turbo -tiff \ No newline at end of file +tiff +flann +boost-filesystem +boost-date-time +boost-iostreams +boost-foreach +boost-signals2 +boost-interprocess +boost-graph +boost-asio