Update Entwine and OpenSfM to pull from OpenDroneMap repo. Run tests in Docker build. Add warning of non-maintenance to configure_macos.sh.

pull/1904/head
Nathan 2025-08-20 06:53:11 -07:00
rodzic 42a42714c2
commit 9b6f4b1c22
4 zmienionych plików z 14 dodań i 4 usunięć

Wyświetl plik

@ -14,6 +14,9 @@ COPY . ./
# Run the build
RUN bash configure.sh install
# Run the tests
RUN bash test.sh
# Clean Superbuild
RUN bash configure.sh clean

Wyświetl plik

@ -12,8 +12,8 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/NathanMOlson/entwine/
GIT_TAG e1adc04564ab2324516ba9f1fa448c3e4b5040ff
GIT_REPOSITORY https://github.com/OpenDroneMap/entwine/
GIT_TAG 0cf957432f291e841ff1385085dadad933dcba8d
#--Update/Patch step----------
UPDATE_COMMAND ""
#--Configure step-------------
@ -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-----------------

Wyświetl plik

@ -24,8 +24,8 @@ ExternalProject_Add(${_proj_name}
STAMP_DIR ${_SB_BINARY_DIR}/stamp
#--Download step--------------
DOWNLOAD_DIR ${SB_DOWNLOAD_DIR}
GIT_REPOSITORY https://github.com/NathanMOlson/OpenSfM/
GIT_TAG f5c35e6379cea899fe1033c9ecc09ab3a870f861
GIT_REPOSITORY https://github.com/OpenDroneMap/OpenSfM/
GIT_TAG c5328439465e6ace011f39077d1077d7b1cdd65d
#--Update/Patch step----------
UPDATE_COMMAND git submodule update --init --recursive
#--Configure step-------------

Wyświetl plik

@ -1,4 +1,9 @@
#!/bin/bash
echo "!!! WARNING! !!!"
echo "!!! This script is not currently maintained and may not work! !!!"
echo "!!! See https://community.opendronemap.org/t/odm-install-on-a-mac-os-14-6-1/25007 !!!"
uname=$(uname)
if [[ "$uname" != "Darwin" ]]; then
echo "This script is meant for MacOS only."