diff --git a/CMakeLists.txt b/CMakeLists.txt index 3193fb9b45e432032038b3b6e1f19045f13ba05d..89f71a49728eb91d1d3745e4518f549ac6326fff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -439,7 +439,7 @@ if(UNIX) configure_file(${OTB_SOURCE_DIR}/Packaging/Files/post_install.sh.in ${CMAKE_BINARY_DIR}/post_install.sh @ONLY) install( PROGRAMS - ${OTB_SOURCE_DIR}/Packaging/Files/check_python_env.sh + ${OTB_SOURCE_DIR}/Packaging/Files/build_gdal_bindings.sh ${CMAKE_BINARY_DIR}/post_install.sh ${OTB_SOURCE_DIR}/Packaging/Files/sanitize_rpath.sh DESTINATION ./tools diff --git a/Documentation/Cookbook/rst/CompilingOTBFromSource.rst b/Documentation/Cookbook/rst/CompilingOTBFromSource.rst index bcdc3b486a91a640353ed028fff74141750b7c0e..286e2e08ddf1f811001c12d62ce833c1107685f7 100644 --- a/Documentation/Cookbook/rst/CompilingOTBFromSource.rst +++ b/Documentation/Cookbook/rst/CompilingOTBFromSource.rst @@ -25,33 +25,33 @@ process: +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | **Library** | **Mandatory** | **Minimum version** | **Superbuild Version** | +===================================================================+=======================+============================+==========================+ - | `Boost <http://www.boost.org>`_ | Yes | 1.73.0 | 1.82.0 | + | `Boost <http://www.boost.org>`_ | Yes | 1.73.0 | 1.86.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `Expat <https://sourceforge.net/projects/expat/>`_ | Yes | | 2.5.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `Geos <https://libgeos.org/>`_ | Yes | | 3.12.1 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `ITK <http://www.itk.org>`_ | Yes | 4.6.0 | 4.13.3 | + | `ITK <http://www.itk.org>`_ | Yes | 5.0.0 | 5.3.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `GDAL <http://www.gdal.org>`_ | Yes | 2.4.1 | 3.8.3 | + | `GDAL <http://www.gdal.org>`_ | Yes | 3.0.0 | 3.9.3 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `HDF4 <https://www.hdfgroup.org/solutions/hdf4/>`_ | Yes | | 4.2.13 | + | `HDF4 <https://www.hdfgroup.org/solutions/hdf4/>`_ | Yes | | 4.2.15 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `HDF5 <https://www.hdfgroup.org/solutions/hdf5/>`_ | Yes | | 1.12.3 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.1 | + | `libgeotiff <http://trac.osgeo.org/geotiff/>`_ | Yes | | 1.7.3 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `libjpeg-turbo <https://github.com/libjpeg-turbo/libjpeg-turbo>`_ | Yes | | 3.0.3 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `libpng <https://downloads.sourceforge.net/project/libpng>`_ | Yes | | 1.6.37 | + | `libpng <https://downloads.sourceforge.net/project/libpng>`_ | Yes | | 1.6.44 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `libtiff <http://www.libtiff.org/>`_ | Yes | | 4.6.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `NetCDF <https://github.com/Unidata/netcdf-c>`_ | Yes | | 4.9.2 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `OpenJPEG <https://github.com/uclouvain/openjpeg>`_ | Yes | | 2.5.0 | + | `OpenJPEG <https://github.com/uclouvain/openjpeg>`_ | Yes | | 2.5.2 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `PROJ <https://proj.org/>`_ | Yes | | 9.3.1 | + | `PROJ <https://proj.org/>`_ | Yes | | 9.5.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `SQLITE <https://www.sqlite.org>`_ | Yes | | 3.42.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ @@ -61,7 +61,7 @@ process: +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `6S <http://6s.ltdri.org>`_ | No | | | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `Curl <http://www.curl.haxx.se>`_ | No | | 8.2.1 | + | `Curl <http://www.curl.haxx.se>`_ | No | | 8.10.1 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `FFTW <http://www.fftw.org>`_ | No | | 3.3.10 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ @@ -69,11 +69,11 @@ process: +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `MPI <https://www.open-mpi.org/>`_ | No | | | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.3.2 | + | `MuParser <http://www.muparser.sourceforge.net>`_ | No | | 2.3.4 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.8 | + | `MuParserX <http://muparserx.beltoforion.de>`_ | No | 4.0.7 | 4.0.12 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ - | `OpenCV <http://opencv.org>`_ | No | 3.0.0 | 4.6.0 | + | `OpenCV <http://opencv.org>`_ | No | 3.0.0 | 4.10.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ | `Shark <http://image.diku.dk/shark/>`_ | No | 4 | 4.0 | +-------------------------------------------------------------------+-----------------------+----------------------------+--------------------------+ diff --git a/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx b/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx index 7447e63c129c98b4f6fd37845ec5fa4955e9cf77..fd85646a508dfd2abac654b7500e7e803a7597a8 100644 --- a/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx +++ b/Modules/Core/Adapters/GdalAdapters/src/otbSpatialReference.cxx @@ -27,6 +27,7 @@ // For boost/lexical_cast.hpp #endif #include "boost/lexical_cast.hpp" +#include <cassert> #include <sstream> #include <stdexcept> diff --git a/Modules/ThirdParty/Boost/otb-module-init.cmake b/Modules/ThirdParty/Boost/otb-module-init.cmake index c9a05b0f4329a8f0b15ef3ed2631e1eb625ef625..3530d52af5a7533a291d1b34ad1295a8fc07bc36 100644 --- a/Modules/ThirdParty/Boost/otb-module-init.cmake +++ b/Modules/ThirdParty/Boost/otb-module-init.cmake @@ -34,12 +34,12 @@ else() endif() if(OTBGroup_Core AND NOT OTBGroup_Learning) - find_package (Boost 1.35.0 REQUIRED COMPONENTS filesystem) + find_package (Boost 1.73.0 REQUIRED COMPONENTS filesystem) else() - find_package (Boost 1.35.0 REQUIRED COMPONENTS filesystem serialization) + find_package (Boost 1.73.0 REQUIRED COMPONENTS filesystem serialization) endif() if (BUILD_TESTING) - find_package (Boost 1.35.0 QUIET COMPONENTS filesystem serialization unit_test_framework) + find_package (Boost 1.73.0 QUIET COMPONENTS filesystem serialization unit_test_framework) if (NOT Boost_UNIT_TEST_FRAMEWORK_FOUND) message(STATUS "Boost unit_test_framework not found. Hence test depending on this framework will be skipped") else() diff --git a/SuperBuild/CMake/External_boost.cmake b/SuperBuild/CMake/External_boost.cmake index c2a0dbaa47cafdeb7b41bccef0861730b295eca6..8731c9bb9bbe30d67517dc57bd12c7242549ef94 100644 --- a/SuperBuild/CMake/External_boost.cmake +++ b/SuperBuild/CMake/External_boost.cmake @@ -86,8 +86,8 @@ set(BOOST_BUILD_COMMAND ${CMAKE_COMMAND} #NOTE: update _SB_Boost_INCLUDE_DIR below when you change version number ExternalProject_Add(BOOST PREFIX BOOST - URL "https://downloads.sourceforge.net/project/boost/boost/1.82.0/boost_1_82_0.tar.bz2" - URL_MD5 b45dac8b54b58c087bfbed260dbfc03a + URL "https://archives.boost.io/release/1.86.0/source/boost_1_86_0.tar.bz2" + URL_MD5 2d098ba2e1457708a02de996857c2b10 BINARY_DIR ${BOOST_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} @@ -103,7 +103,7 @@ ExternalProject_Add(BOOST #HINT: avoid all uses of _SB_* in External_<project>.cmake # and depend on much saner CMAKE_PREFIX_PATH for cmake projects. if(WIN32) - set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include/boost-1_82) + set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include/boost-1_86) else() set(_SB_Boost_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include) endif() diff --git a/SuperBuild/CMake/External_opencv.cmake b/SuperBuild/CMake/External_opencv.cmake index 38c859dcb6f3107fbb99bd44114f8fa6beaf7580..5953521a3890c4529e495fb0c553f4c2ab7164d5 100644 --- a/SuperBuild/CMake/External_opencv.cmake +++ b/SuperBuild/CMake/External_opencv.cmake @@ -34,8 +34,8 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENCV PNG_LIBRARY) ExternalProject_Add(OPENCV PREFIX OPENCV - URL "https://github.com/opencv/opencv/archive/4.6.0.tar.gz" - URL_MD5 2f52df67b255fcc2c36632a9e9f723f6 + URL "https://github.com/opencv/opencv/archive/4.10.0.tar.gz" + URL_MD5 adaf23e87339e6df6d50d68001138ccc BINARY_DIR ${OPENCV_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_openjpeg.cmake b/SuperBuild/CMake/External_openjpeg.cmake index 7340a2c98dbf71500742daf1e5a87c938a4ee53f..99c21a6a7112f63dd99bb315373c74795655e48a 100644 --- a/SuperBuild/CMake/External_openjpeg.cmake +++ b/SuperBuild/CMake/External_openjpeg.cmake @@ -38,9 +38,9 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG PNG_LIBRARY) ExternalProject_Add(OPENJPEG PREFIX OPENJPEG - URL "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz" - URL_MD5 3b9941dc7a52f0376694adb15a72903f - DOWNLOAD_NAME openjpeg_v2.3.1.tar.gz + URL "https://github.com/uclouvain/openjpeg/archive/v2.5.2.tar.gz" + URL_MD5 f9ee64845881a15109ed0aa73a12202f + DOWNLOAD_NAME openjpeg_v2.5.2.tar.gz BINARY_DIR ${OPENJPEG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION} diff --git a/SuperBuild/CMake/External_png.cmake b/SuperBuild/CMake/External_png.cmake index 355bb83d608da0db5780818c6d6c443f07541cd9..905bbfe9a0377019dafdd0cc497975686c723c97 100644 --- a/SuperBuild/CMake/External_png.cmake +++ b/SuperBuild/CMake/External_png.cmake @@ -30,8 +30,8 @@ ADD_SUPERBUILD_CMAKE_VAR(PNG ZLIB_LIBRARY) ExternalProject_Add(PNG PREFIX PNG - URL "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.37/libpng-1.6.37.tar.gz" - URL_MD5 6c7519f6c75939efa0ed3053197abd54 + URL "https://downloads.sourceforge.net/project/libpng/libpng16/1.6.44/libpng-1.6.44.tar.gz" + URL_MD5 a780d4929c0bb47aaaf53d2e080b2a79 BINARY_DIR ${PNG_SB_BUILD_DIR} INSTALL_DIR ${SB_INSTALL_PREFIX} DOWNLOAD_DIR ${DOWNLOAD_LOCATION}