Skip to content
Merged

24.04 #1904

Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
04bdc89
OpenSfM failing with pybind stuff
NathanMOlson Jul 31, 2025
0505bd5
getting close... renderdem link error
NathanMOlson Aug 1, 2025
3ee1f12
compiling!
NathanMOlson Aug 1, 2025
625e759
use newest MicaSense dls file
NathanMOlson Aug 1, 2025
dc7306b
install rawpy
NathanMOlson Aug 1, 2025
79de956
fix requirements syntax
NathanMOlson Aug 1, 2025
5d1794b
fix OpenSfM build
NathanMOlson Aug 1, 2025
a7b32c3
fix syntax warnings
NathanMOlson Aug 1, 2025
16d3c81
python3.12. Now passes smoke test
NathanMOlson Aug 1, 2025
6140170
update runtime dependencies
NathanMOlson Aug 1, 2025
3cceddb
successfully creates an orthophoto
NathanMOlson Aug 1, 2025
e7052c6
Merge branch 'master' into 24.04
NathanMOlson Aug 9, 2025
a445f05
update portable Dockerfile
NathanMOlson Aug 9, 2025
7f8fce8
Merge branch '24.04' of github.com:NathanMOlson/ODM into 24.04
NathanMOlson Aug 9, 2025
9806d91
change PDAL to use upstream + patch
NathanMOlson Aug 10, 2025
3fdbcc2
use upstream pdal-python
NathanMOlson Aug 10, 2025
15d0b4d
use a virtual environment for python packages
NathanMOlson Aug 11, 2025
ad18ea4
fix opencv and pdal-python builds, which were getting built with nump…
NathanMOlson Aug 11, 2025
9ac60ae
update entwine
NathanMOlson Aug 11, 2025
4a483ab
update external libraries
NathanMOlson Aug 14, 2025
dda05ce
Merge branch '24.04' of github.com:NathanMOlson/ODM into 24.04
NathanMOlson Aug 14, 2025
5ff05c8
Remove JPEG-XL packages.. This is not directly related to upgrading t…
NathanMOlson Aug 14, 2025
1342e3a
update OpenSfM so fix linking probmel that caused unit tests to fail
NathanMOlson Aug 14, 2025
2ee47a1
change unit test to match current behavior, which sets the "--skip-re…
NathanMOlson Aug 14, 2025
877fb00
change unit test to match current behavior, which sets the "--skip-re…
NathanMOlson Aug 14, 2025
5f56e30
Remove failing test that expected an exception when loading a set of …
NathanMOlson Aug 14, 2025
7aa38ae
update OpenSfM to fix linking problem that caused unit tests to fail
NathanMOlson Aug 14, 2025
8209bd0
update OpenSfM to latest
NathanMOlson Aug 15, 2025
5957883
update to latest version of draco
NathanMOlson Aug 15, 2025
42a4271
use ODM repo for draco and MvsTexturing
NathanMOlson Aug 18, 2025
5d4862e
Ensure mvs-texturing respects max_concurrency flag (#1913)
smathermather Aug 19, 2025
9b6f4b1
Update Entwine and OpenSfM to pull from OpenDroneMap repo. Run tests …
NathanMOlson Aug 20, 2025
7730b86
run tests in all Dockerfiles (including the one that runs in github a…
NathanMOlson Aug 20, 2025
1334f65
use the python venv to run unit tests
NathanMOlson Aug 20, 2025
d505192
add forward option to retain las file scale and offset (#1915)
originlake Aug 24, 2025
e9c2572
Update External-OpenPointClass.cmake (#1916)
smathermather Aug 24, 2025
892a1ce
free disk space before docker and GPU build (#1917)
smathermather Aug 24, 2025
8c20764
Gpu runner space (#1920)
smathermather Aug 25, 2025
dcd1fa6
Revert "Gpu runner space (#1920)" (#1921)
smathermather Aug 25, 2025
2980065
Revert "free disk space before docker and GPU build (#1917)" (#1922)
smathermather Aug 25, 2025
51c9bab
Changes to support Windows build
NathanMOlson Aug 25, 2025
42d7fe5
Merge branch 'master' into 24.04
NathanMOlson Aug 25, 2025
d631c91
fix misnaming of Ceres version
NathanMOlson Aug 25, 2025
51726a3
update readme
NathanMOlson Aug 25, 2025
bf985b4
update pypopsift to use upstream popsift
NathanMOlson Aug 29, 2025
d98b9c1
Use ODM repo for pypopsift
NathanMOlson Sep 4, 2025
48ea557
use upstream ExifRead
NathanMOlson Sep 4, 2025
a84e483
use upstream draco
NathanMOlson Sep 4, 2025
0da1ed3
Use ODM's windows-deps repo for windows deps
NathanMOlson Sep 8, 2025
137b1b0
turn off GIT_SHALLOW for draco
NathanMOlson Sep 9, 2025
fb6bd60
fix GDAL/Numpy conflict by installing GDAL Python package from pip in…
NathanMOlson Sep 15, 2025
247625d
update syntax of `pdal info` command to match current PDAL version
NathanMOlson Oct 3, 2025
cdf973b
update syntax of `pdal info` command to match current PDAL version
NathanMOlson Oct 6, 2025
50545bf
replace deprecated scikit parameter `selem` with new parameter `footp…
NathanMOlson Oct 21, 2025
b9f291f
Attempt to use new codem API for ApplyRegistration.get_registration_t…
NathanMOlson Oct 21, 2025
19b33e1
fix registration parsing from get_registration_transformation()
NathanMOlson Oct 21, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Dockerfile
tests/test_data
SuperBuild/build
SuperBuild/download
SuperBuild/install
Expand All @@ -18,8 +17,6 @@ images_resize
/hooks
/img
/license
/tests
tests.sh
settings.yml
code_of_conduct.md
configure_18_04.sh
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/build_vcpkg_env.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Build Windows Dependencies

on:
workflow_dispatch:

jobs:
windows:
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up vcpkg
run: |
git clone https://github.com/microsoft/vcpkg.git
.\vcpkg\bootstrap-vcpkg.bat

- name: Install vcpkg dependencies
run: .\vcpkg\vcpkg.exe install --triplet x64-windows

- name: Export vcpkg dependencies
run: .\vcpkg\vcpkg.exe export --zip --output=vcpkg-export --output-dir=.

- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: vcpkg-env-x64-windows
path: vcpkg-export.zip
6 changes: 3 additions & 3 deletions .github/workflows/publish-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: '3.8.1'
python-version: '3.12.10'
architecture: 'x64'
- uses: Jimver/[email protected].4
- uses: Jimver/[email protected].24
id: cuda-toolkit
with:
cuda: '11.4.0'
cuda: '12.8.1'
- name: Setup cmake
uses: jwlawson/[email protected]
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-build-prs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,19 +49,19 @@ jobs:
# isClassic: 'false'

windows:
runs-on: windows-2019
runs-on: windows-2022
steps:
- name: Checkout
uses: actions/checkout@v2
- name: Setup Python
uses: actions/setup-python@v2
with:
python-version: '3.8.1'
python-version: '3.12.10'
architecture: 'x64'
- uses: Jimver/[email protected].4
- uses: Jimver/[email protected].24
id: cuda-toolkit
with:
cuda: '11.4.0'
cuda: '12.8.1'
- name: Setup cmake
uses: jwlawson/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ storage/

vcpkg/
venv/
python38/
python312/
dist/
innosetup/
.DS_Store
22 changes: 10 additions & 12 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM ubuntu:21.04 AS builder
FROM ubuntu:24.04 AS builder

# Env variables
ENV DEBIAN_FRONTEND=noninteractive \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9/dist-packages:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/install/bin/opensfm" \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.12/dist-packages:/code/SuperBuild/install/bin/opensfm" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib"

# Prepare directories
Expand All @@ -11,24 +11,25 @@ WORKDIR /code
# Copy everything
COPY . ./

# Use old-releases for 21.04
RUN printf "deb http://old-releases.ubuntu.com/ubuntu/ hirsute main restricted\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates main restricted\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute universe\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates universe\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute multiverse\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates multiverse\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-backports main restricted universe multiverse" > /etc/apt/sources.list

# Run the build
RUN bash configure.sh install

# Run the tests
ENV PATH="/code/venv/bin:$PATH"
RUN bash test.sh

# Clean Superbuild
RUN bash configure.sh clean

### END Builder

### Use a second image for the final asset to reduce the number and
# size of the layers.
FROM ubuntu:21.04
FROM ubuntu:24.04

# Env variables
ENV DEBIAN_FRONTEND=noninteractive \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.9:/code/SuperBuild/install/lib/python3.8/dist-packages:/code/SuperBuild/install/bin/opensfm" \
PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python3.12/dist-packages:/code/SuperBuild/install/bin/opensfm" \
LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" \
PDAL_DRIVER_PATH="/code/SuperBuild/install/bin"

Expand All @@ -37,11 +38,7 @@ WORKDIR /code
# Copy everything we built from the builder
COPY --from=builder /code /code

# Copy the Python libraries installed via pip from the builder
COPY --from=builder /usr/local /usr/local

# Use old-releases for 21.04
RUN printf "deb http://old-releases.ubuntu.com/ubuntu/ hirsute main restricted\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates main restricted\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute universe\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates universe\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute multiverse\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-updates multiverse\ndeb http://old-releases.ubuntu.com/ubuntu/ hirsute-backports main restricted universe multiverse" > /etc/apt/sources.list
ENV PATH="/code/venv/bin:$PATH"

# Install shared libraries that we depend on via APT, but *not*
# the -dev packages to save space!
Expand All @@ -51,5 +48,6 @@ RUN bash configure.sh installruntimedepsonly \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* \
&& bash run.sh --help \
&& bash -c "eval $(python3 /code/opendm/context.py) && python3 -c 'from opensfm import io, pymap'"

# Entry point
ENTRYPOINT ["python3", "/code/run.py"]
16 changes: 6 additions & 10 deletions SuperBuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -96,14 +96,9 @@ 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}/gdal.lib")
set(GDAL_INCLUDE_DIR "${GDAL_ROOT}/include/gdal")

# Also download missing headers :/
if (NOT EXISTS "${GDAL_INCLUDE_DIR}/ogrsf_frmts.h")
file(DOWNLOAD "https://raw.githubusercontent.com/OSGeo/gdal/release/3.2/gdal/ogr/ogrsf_frmts/ogrsf_frmts.h" "${GDAL_INCLUDE_DIR}/ogrsf_frmts.h")
endif()

message("Copying VCPKG DLLs...")
file(GLOB COPY_DLLS "${VCPKG_ROOT}/installed/x64-windows/bin/*.dll")
file(COPY ${COPY_DLLS} DESTINATION "${SB_INSTALL_DIR}/bin")
Expand All @@ -117,7 +112,8 @@ elseif(APPLE)
set(PYTHON_HOME "${SB_ROOT_DIR}/../venv")
set(PYTHON_EXE_PATH "${PYTHON_HOME}/bin/python")
else()
set(PYTHON_EXE_PATH "/usr/bin/python3")
set(PYTHON_HOME "${SB_ROOT_DIR}/../venv")
set(PYTHON_EXE_PATH "${PYTHON_HOME}/bin/python3")
endif()

# Path to additional CMake modules
Expand All @@ -133,7 +129,7 @@ include(ExternalProject-Setup)
# ---------------------------------------------------------------------------------------------
# Open Source Computer Vision (OpenCV)
#
set(ODM_OpenCV_Version 2.4.11)
set(ODM_OpenCV_Version 4.12.0)
option(ODM_BUILD_OpenCV "Force to build OpenCV library" OFF)

SETUP_EXTERNAL_PROJECT(OpenCV ${ODM_OpenCV_Version} ${ODM_BUILD_OpenCV})
Expand All @@ -160,7 +156,7 @@ SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
# ---------------------------------------------------------------------------------------------
# Hexer
#
SETUP_EXTERNAL_PROJECT(Hexer 1.4 ON)
SETUP_EXTERNAL_PROJECT(Hexer 1.5 ON)

# ---------------------------------------------------------------------------------------------
# Open Structure from Motion (OpenSfM)
Expand Down Expand Up @@ -271,7 +267,7 @@ externalproject_add(lastools
externalproject_add(draco
GIT_REPOSITORY https://github.com/OpenDroneMap/draco
GIT_SHALLOW ON
GIT_TAG 304
GIT_TAG 915105aef5d0e0fbebc5a98238cfda10f06e61b9
PREFIX ${SB_BINARY_DIR}/draco
SOURCE_DIR ${SB_SOURCE_DIR}/draco
CMAKE_ARGS -DDRACO_TRANSCODER_SUPPORTED=ON
Expand Down
1 change: 1 addition & 0 deletions SuperBuild/cmake/External-Ceres.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ ExternalProject_Add(${_proj_name}
URL http://ceres-solver.org/ceres-solver-2.0.0.tar.gz
#--Update/Patch step----------
UPDATE_COMMAND ""
PATCH_COMMAND git apply ${CMAKE_MODULE_PATH}/ceres.patch
#--Configure step-------------
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
CMAKE_ARGS
Expand Down
4 changes: 3 additions & 1 deletion SuperBuild/cmake/External-Entwine.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ ExternalProject_Add(${_proj_name}
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/OpenDroneMap/entwine/
GIT_TAG 290
GIT_TAG 0cf957432f291e841ff1385085dadad933dcba8d
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
Expand All @@ -23,6 +23,8 @@ ExternalProject_Add(${_proj_name}
-DADDITIONAL_LINK_DIRECTORIES_PATHS=${SB_INSTALL_DIR}/lib
-DWITH_TESTS=OFF
-DWITH_ZSTD=OFF
-DWITH_CURL=OFF
-DWITH_OPENSSL=OFF
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}
#--Build step-----------------
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/cmake/External-Hexer.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
URL https://github.com/hobu/hexer/archive/bc748fc16b51c562f68f6641574b7af4244adfa2.tar.gz
URL https://github.com/hobuinc/hexer/archive/5876a5ab1d5b504cf1ea985d66ae359287eef31e.tar.gz
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/cmake/External-MvsTexturing.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ExternalProject_Add(${_proj_name}
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}/${_proj_name}
GIT_REPOSITORY https://github.com/OpenDroneMap/mvs-texturing
GIT_TAG 290
GIT_TAG c5a4d0c9a434553533c6e39d426e349fcfa5f48d
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
Expand Down
20 changes: 12 additions & 8 deletions SuperBuild/cmake/External-OpenCV.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,36 @@ set(_proj_name opencv)
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")

if (WIN32)
set(OCV_CMAKE_EXTRA_ARGS -DPYTHON3_NUMPY_INCLUDE_DIRS=${PYTHON_HOME}/lib/site-packages/numpy/core/include
set(OCV_CMAKE_EXTRA_ARGS -DPYTHON3_NUMPY_INCLUDE_DIRS=${PYTHON_HOME}/lib/site-packages/numpy/_core/include
-DPYTHON3_PACKAGES_PATH=${PYTHON_HOME}/lib/site-packages
-DPYTHON3_EXECUTABLE=${PYTHON_EXE_PATH}
-DWITH_MSMF=OFF
-DOPENCV_LIB_INSTALL_PATH=${SB_INSTALL_DIR}/lib
-DOPENCV_BIN_INSTALL_PATH=${SB_INSTALL_DIR}/bin)
elseif(APPLE)
# macOS is unable to automatically detect our Python libs
set(OCV_CMAKE_EXTRA_ARGS -DPYTHON3_NUMPY_INCLUDE_DIRS=${PYTHON_HOME}/lib/python3.8/site-packages/numpy/core/include
-DPYTHON3_PACKAGES_PATH=${PYTHON_HOME}/lib/python3.8/site-packages
set(OCV_CMAKE_EXTRA_ARGS -DPYTHON3_NUMPY_INCLUDE_DIRS=${PYTHON_HOME}/lib/python3.12/site-packages/numpy/core/include
-DPYTHON3_PACKAGES_PATH=${PYTHON_HOME}/lib/python3.12/site-packages
-DPYTHON3_EXECUTABLE=${PYTHON_EXE_PATH}
-DPYTHON3_LIBRARIES=${HOMEBREW_INSTALL_PREFIX}/opt/python@3.8/Frameworks/Python.framework/Versions/3.8/lib/libpython3.8.dylib
-DPYTHON3_INCLUDE_DIR=${HOMEBREW_INSTALL_PREFIX}/opt/python@3.8/Frameworks/Python.framework/Versions/3.8/include/python3.8/
-DPYTHON3_INCLUDE_PATH=${HOMEBREW_INSTALL_PREFIX}/opt/python@3.8/Frameworks/Python.framework/Versions/3.8/include/python3.8/
-DPYTHON3_LIBRARIES=${HOMEBREW_INSTALL_PREFIX}/opt/python@3.12/Frameworks/Python.framework/Versions/3.12/lib/libpython3.12.dylib
-DPYTHON3_INCLUDE_DIR=${HOMEBREW_INSTALL_PREFIX}/opt/python@3.12/Frameworks/Python.framework/Versions/3.12/include/python3.12/
-DPYTHON3_INCLUDE_PATH=${HOMEBREW_INSTALL_PREFIX}/opt/python@3.12/Frameworks/Python.framework/Versions/3.12/include/python3.12/
-DPYTHON3INTERP_FOUND=ON
-DPYTHON3LIBS_FOUND=ON
-DPYTHON_DEFAULT_AVAILABLE=ON
-DPYTHON_DEFAULT_EXECUTABLE=${PYTHON_EXE_PATH}
-DPYTHON3_VERSION_MAJOR=3
-DPYTHON3_VERSION_MINOR=8
-DOPENCV_CONFIG_INSTALL_PATH=
-DOPENCV_PYTHON_INSTALL_PATH=${SB_INSTALL_DIR}/lib/python3.8/dist-packages
-DOPENCV_PYTHON_INSTALL_PATH=${SB_INSTALL_DIR}/lib/python3.12/dist-packages
-DHAVE_opencv_python3=ON
-DOPENCV_PYTHON_SKIP_DETECTION=ON
-DOPENCV_LIB_INSTALL_PATH=${SB_INSTALL_DIR}/lib
-DOPENCV_BIN_INSTALL_PATH=${SB_INSTALL_DIR}/bin)
else()
set(OCV_CMAKE_EXTRA_ARGS -DPYTHON3_NUMPY_INCLUDE_DIRS=${PYTHON_HOME}/lib/python3.12/site-packages/numpy/_core/include
-DPYTHON3_PACKAGES_PATH=${PYTHON_HOME}/lib/python3.12/site-packages
-DPYTHON3_EXECUTABLE=${PYTHON_EXE_PATH})
endif()

ExternalProject_Add(${_proj_name}
Expand All @@ -36,7 +40,7 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
URL https://github.com/opencv/opencv/archive/4.5.0.zip
URL https://github.com/opencv/opencv/archive/4.12.0.zip
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
Expand Down
2 changes: 1 addition & 1 deletion SuperBuild/cmake/External-OpenPointClass.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ ExternalProject_Add(${_proj_name}
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/uav4geo/OpenPointClass
GIT_TAG v1.1.3
GIT_TAG dd6a560a1d43cb709f7b220b19a436e25a889e3e
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
Expand Down
4 changes: 2 additions & 2 deletions SuperBuild/cmake/External-OpenSfM.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ ProcessorCount(nproc)

set(EXTRA_INCLUDE_DIRS "")
if(WIN32)
set(OpenCV_DIR "${SB_INSTALL_DIR}/x64/vc16/lib")
set(OpenCV_DIR "${SB_INSTALL_DIR}/x64/vc17/lib")
set(BUILD_CMD ${CMAKE_COMMAND} --build "${SB_BUILD_DIR}/opensfm" --config "${CMAKE_BUILD_TYPE}")
else()
set(BUILD_CMD make "-j${nproc}")
Expand All @@ -25,7 +25,7 @@ ExternalProject_Add(${_proj_name}
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/OpenDroneMap/OpenSfM/
GIT_TAG 355
GIT_TAG c5328439465e6ace011f39077d1077d7b1cdd65d
#--Update/Patch step----------
UPDATE_COMMAND git submodule update --init --recursive
#--Configure step-------------
Expand Down
4 changes: 3 additions & 1 deletion SuperBuild/cmake/External-PDAL.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
URL https://github.com/OpenDroneMap/PDAL/archive/refs/heads/333.zip
GIT_REPOSITORY https://github.com/PDAL/PDAL/
GIT_TAG 831631084edc7e61bc898eae136294c375b13d14
#--Update/Patch step----------
UPDATE_COMMAND ""
PATCH_COMMAND git apply ${CMAKE_MODULE_PATH}/pdal.patch
#--Configure step-------------
SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name}
CMAKE_ARGS
Expand Down
22 changes: 15 additions & 7 deletions SuperBuild/cmake/External-PDALPython.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,12 @@ set(_proj_name pdal-python)
set(_SB_BINARY_DIR "${SB_BINARY_DIR}/${_proj_name}")

if (WIN32)
set(PP_EXTRA_ARGS -DPYTHON3_EXECUTABLE=${PYTHON_EXE_PATH}
-DPython3_NumPy_INCLUDE_DIRS=${PYTHON_HOME}/lib/site-packages/numpy/core/include)
set(PP_EXTRA_ARGS -DPython3_EXECUTABLE=${PYTHON_EXE_PATH}
-DPython3_ROOT_DIR=${PYTHON_HOME}
-DPython3_NumPy_INCLUDE_DIRS=${PYTHON_HOME}/Lib/site-packages/numpy/_core/include)
else()
set(PP_EXTRA_ARGS -DPython3_EXECUTABLE=${PYTHON_EXE_PATH}
-DPython3_NumPy_INCLUDE_DIRS=${PYTHON_HOME}/lib/python3.12/site-packages/numpy/_core/include)
endif()

ExternalProject_Add(${_proj_name}
Expand All @@ -13,24 +17,28 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/OpenDroneMap/pdal-python
GIT_TAG main
GIT_REPOSITORY https://github.com/PDAL/python
GIT_TAG 6791a880a87e95f7318e99acfb4a10186379c5dd
#--Update/Patch step----------
UPDATE_COMMAND ""
UPDATE_COMMAND git submodule update --init --recursive
#--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
-DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR}/lib/python3.12/dist-packages
${WIN32_CMAKE_ARGS}
${PP_EXTRA_ARGS}
#--Build step-----------------
BINARY_DIR ${_SB_BINARY_DIR}
#--Install step---------------
INSTALL_DIR ${SB_INSTALL_DIR}
INSTALL_COMMAND ${CMAKE_COMMAND} --build <BINARY_DIR> --target install
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SB_SOURCE_DIR}/${_proj_name}/src/pdal/__init__.py ${SB_INSTALL_DIR}/lib/python3.12/dist-packages/pdal
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SB_SOURCE_DIR}/${_proj_name}/src/pdal/pipeline.py ${SB_INSTALL_DIR}/lib/python3.12/dist-packages/pdal
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SB_SOURCE_DIR}/${_proj_name}/src/pdal/drivers.py ${SB_INSTALL_DIR}/lib/python3.12/dist-packages/pdal
#--Output logging-------------
LOG_DOWNLOAD OFF
LOG_CONFIGURE OFF
LOG_BUILD OFF
)
)
Loading
Loading