diff --git a/configure_macos.sh b/configure_macos.sh index 7442e5f3..b86c5f30 100755 --- a/configure_macos.sh +++ b/configure_macos.sh @@ -34,7 +34,7 @@ installreqs() { python3.8 -m pip install virtualenv - if [ ! -e ./venv ]; then + if [ ! -e ${RUNPATH}/venv ]; then python3.8 -m virtualenv venv fi @@ -48,7 +48,7 @@ install() { echo "Compiling SuperBuild" cd ${RUNPATH}/SuperBuild mkdir -p build && cd build - cmake .. && make -j$processes && make -j$processes opensfm + cmake .. && make -j$processes cd /tmp pip download GDAL==3.5.1 diff --git a/requirements.txt b/requirements.txt index e6f97f4c..c5441e9a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,6 +24,7 @@ https://github.com/OpenDroneMap/windows-deps/raw/main/rasterio-1.2.3-cp38-cp38-w https://github.com/OpenDroneMap/windows-deps/raw/main/GDAL-3.2.3-cp38-cp38-win_amd64.whl ; sys_platform == 'win32' repoze.lru==0.7 scikit-learn==1.1.1 +Pywavelets==1.3.0 scikit-image==0.19.3 scipy==1.8.1 xmltodict==0.12.0 diff --git a/run.sh b/run.sh index d9369dad..a01df6e2 100755 --- a/run.sh +++ b/run.sh @@ -1,6 +1,9 @@ #!/bin/bash RUNPATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +if [ -e $RUNPATH/venv ]; then + source $RUNPATH/venv/bin/activate +fi export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib export DYLD_LIBRARY_PATH=$RUNPATH/SuperBuild/install/lib python3 $RUNPATH/run.py "$@"