diff --git a/SuperBuild/cmake/External-Ceres.cmake b/SuperBuild/cmake/External-Ceres.cmake index 323deef15..6be312278 100644 --- a/SuperBuild/cmake/External-Ceres.cmake +++ b/SuperBuild/cmake/External-Ceres.cmake @@ -11,7 +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 + PATCH_COMMAND patch -p1 < ${CMAKE_MODULE_PATH}/ceres.patch #--Configure step------------- SOURCE_DIR ${SB_SOURCE_DIR}/${_proj_name} CMAKE_ARGS diff --git a/SuperBuild/cmake/External-GDAL.cmake b/SuperBuild/cmake/External-GDAL.cmake index 074ff6a6b..1e5a45564 100644 --- a/SuperBuild/cmake/External-GDAL.cmake +++ b/SuperBuild/cmake/External-GDAL.cmake @@ -16,7 +16,8 @@ ExternalProject_Add(${_proj_name} CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${SB_INSTALL_DIR} - -DGDAL_PYTHON_INSTALL_PREFIX=${SB_INSTALL_DIR} + -DGDAL_PYTHON_INSTALL_PREFIX=${PYTHON_HOME} + -DPython_EXECUTABLE=${PYTHON_EXE_PATH} -DBUILD_PYTHON_BINDINGS=ON ${WIN32_CMAKE_ARGS} #--Build step----------------- diff --git a/configure.sh b/configure.sh index e9b09acbd..6c3196d2d 100755 --- a/configure.sh +++ b/configure.sh @@ -3,7 +3,7 @@ # Ensure the DEBIAN_FRONTEND environment variable is set for apt-get calls APT_GET="env DEBIAN_FRONTEND=noninteractive $(command -v apt-get)" -check_version(){ +check_version(){ UBUNTU_VERSION=$(lsb_release -r) case "$UBUNTU_VERSION" in *"20.04"*|*"21.04"*|*"24.04"*) @@ -107,7 +107,7 @@ installruntimedepsonly() { installreqs() { cd /code - + ## Set up library paths export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RUNPATH/SuperBuild/install/lib @@ -115,7 +115,7 @@ installreqs() { echo "Updating the system" ensure_prereqs check_version - + echo "Installing Required Requisites" installdepsfromsnapcraft build prereqs echo "Installing OpenCV Dependencies" @@ -126,7 +126,7 @@ installreqs() { installdepsfromsnapcraft build openmvs echo "Installing GDAL Dependencies" installdepsfromsnapcraft build gdal - + set -e # edt requires numpy to build @@ -135,15 +135,13 @@ installreqs() { } installpython() { - echo "Installing Python requirements with compiled GDAL" + echo "Installing Python requirements" cd /code - export GDAL_CONFIG=${RUNPATH}/SuperBuild/install/bin/gdal-config - set -e venv/bin/pip install -r requirements.txt --ignore-installed set +e } - + install() { installreqs @@ -160,21 +158,20 @@ install() { fi set -eo pipefail - echo "Compiling SuperBuild" cd ${RUNPATH}/SuperBuild mkdir -p build && cd build - cmake .. \ - -DBUILD_PYTHON_BINDINGS=ON \ - -DPython_ROOT=/code/venv \ - -DPython_FIND_VIRTUALENV=ONLY \ - && make -j$processes + cmake .. && make -j$processes + + # Reset terminal state + cd ${RUNPATH} + set +eo pipefail installpython echo "Configuration Finished" } - + uninstall() { check_version