Merge pull request #1127 from alicevision/ci/updateVcpkg/geogramfix

[cmake] all-in-one: Upgrade dependencies

.github/workflows/continuous-integration.yml

@@ -20,7 +20,7 @@ jobs:
   build-linux:
     runs-on: ubuntu-latest
     container:
-      image: alicevision/alicevision-deps:ci-2021-08-05-centos7-cuda10.2
+      image: alicevision/alicevision-deps:ci-2021-10-28-centos7-cuda10.2
     env:
       DEPS_INSTALL_DIR: /opt/AliceVision_install
       BUILD_TYPE: Release
@@ -104,7 +104,7 @@ jobs:
       tripletPath: '${{ github.workspace }}\..\vcpkg\triplets\community\x64-windows-release.cmake'
       BUILD_TYPE: Release
       CTEST_OUTPUT_ON_FAILURE: 1
-      COMMIT_ID: 261c458af6e3eed5d099144aff95d2b5035f656b
+      COMMIT_ID: 7678fa940527fa675b3a1eabf3fb77814d0f81e7
     steps:
       - name: Checkout
         uses: actions/checkout@v2
@@ -116,7 +116,7 @@ jobs:
         # git clone https://github.com/microsoft/vcpkg.git --branch 2021.05.12 https://github.com/DanielDelaporus/vcpkg.git --branch alembic-fix-build-types
         run: |
           cd ..
-          git clone https://github.com/microsoft/vcpkg.git
+          git clone https://github.com/fabiencastan/vcpkg.git
           cd vcpkg
           git checkout ${{ env.COMMIT_ID }}
           cd ${{ github.workspace }}
@@ -175,6 +175,7 @@ jobs:
                           assimp
           # without "cuda" for now
           vcpkgTriplet: x64-windows-release
+          # doNotCache: true
           # Ensure the vcpkg artifacts are cached, they are generated in the 'CMAKE_BINARY_DIR/vcpkg_installed' directory.
           additionalCachedPaths: ${{ env.buildDir }}/vcpkg_installed
 

CMakeLists.txt

@@ -129,6 +129,7 @@ set(ASSIMP_AV_VERSION 5.0.1)
 set(ASSIMP_FILENAME v${ASSIMP_AV_VERSION}.tar.gz)
 ExternalProject_Add(${ASSIMP_TARGET}
       URL https://github.com/assimp/assimp/archive/refs/tags/${ASSIMP_FILENAME}
+      URL_HASH MD5=eb7b7385a5c3194ab46d7f869d7ac6cf
       DOWNLOAD_DIR ${BUILD_DIR}/download/assimp
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
@@ -210,9 +211,17 @@ ExternalProject_Add(${TBB_TARGET}
        BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/tbb
        INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
        CONFIGURE_COMMAND ""
-       BUILD_COMMAND $(MAKE) PREFIX=<INSTALL_DIR>
+       BUILD_COMMAND OS=Linux $(MAKE) PREFIX=<INSTALL_DIR>
        INSTALL_COMMAND mkdir -p <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR} && echo "cp <BINARY_DIR>/build/linux_*_release/*.so* <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}" > tbb_so_files.sh && sh tbb_so_files.sh && cp -r "<BINARY_DIR>/include" "<INSTALL_DIR>"
        )
+# TODO: need to upgrade code in cctag
+# URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.4.0.tar.gz
+# URL_HASH MD5=fa317f16003e31e33a57ae7d888403e4#
+# == Build v2021.4.0
+# TBB_ALLOCATOR_TRAITS_BROKEN: https://github.com/oneapi-src/oneTBB/issues/383
+# CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_CXX_FLAGS=-DTBB_ALLOCATOR_TRAITS_BROKEN -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
+# Use default build / install
+#
 set(TBB_CMAKE_FLAGS -DTBB_INCLUDE_DIRS:PATH=${CMAKE_INSTALL_PREFIX}/include -DTBB_LIBRARIES=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/libtbb.so)
 
 # Add Eigen
@@ -221,10 +230,8 @@ set(EIGEN_DISABLE_ALIGN_FLAGS
     "-DCMAKE_CXX_FLAGS:STRING=-DEIGEN_MAX_ALIGN_BYTES=0 -DEIGEN_MAX_STATIC_ALIGN_BYTES=0"
     "-DCMAKE_C_FLAGS:STRING=-DEIGEN_MAX_ALIGN_BYTES=0 -DEIGEN_MAX_STATIC_ALIGN_BYTES=0")
 ExternalProject_Add(${EIGEN_TARGET}
-       URL https://gitlab.com/libeigen/eigen/-/archive/3.3.9/eigen-3.3.9.tar.bz2
-       URL_HASH MD5=2d5a8dac126c4937fd94d5d10fcd7dd1
-       # URL https://gitlab.com/libeigen/eigen/-/archive/3.4-rc1/eigen-3.4-rc1.tar.bz2
-       # URL_HASH MD5=9a656206a91152c77fd9d16b24345688
+       URL https://gitlab.com/libeigen/eigen/-/archive/3.4.0/eigen-3.4.0.tar.bz2
+       URL_HASH MD5=132dde48fe2b563211675626d29f1707
        DOWNLOAD_DIR ${BUILD_DIR}/download/eigen
        PREFIX ${BUILD_DIR}
        BUILD_IN_SOURCE 0
@@ -260,9 +267,8 @@ endif()
 if(AV_BUILD_LAPACK)
 set(LAPACK_TARGET lapack)
 ExternalProject_Add(${LAPACK_TARGET}
-       #   http://www.netlib.org/lapack/lapack-3.9.0.tar.gz
-       URL https://github.com/Reference-LAPACK/lapack/archive/v3.9.0.tar.gz
-       URL_HASH MD5=0b251e2a8d5f949f99b50dd5e2200ee2
+       URL https://github.com/Reference-LAPACK/lapack/archive/v3.10.0.tar.gz
+       URL_HASH MD5=d70fc27a8bdebe00481c97c728184f09
        DOWNLOAD_DIR ${BUILD_DIR}/download/lapack
        PREFIX ${BUILD_DIR}
        BUILD_IN_SOURCE 0
@@ -311,9 +317,8 @@ ExternalProject_add(mpfr
 set(SUITESPARSE_TARGET suitesparse)
 set(SUITESPARSE_INTERNAL_MAKE_CMD MPFR_ROOT=${CMAKE_INSTALL_PREFIX} GMP_ROOT=${CMAKE_INSTALL_PREFIX} LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} $(MAKE) BLAS="${BLAS_LIBRARIES}" LAPACK="${LAPACK_LIBRARIES}")
 ExternalProject_Add(${SUITESPARSE_TARGET}
-       # URL https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v4.5.6.tar.gz
-       # URL https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.8.1.tar.gz  # requires gxx >= 4.9, centos 7 use gxx-4.8.5 by default
-       # URL_HASH MD5=c414679bbc9432a3def01b31ad921140
+       # URL https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v5.10.1.tar.gz  # requires gxx >= 4.9, centos 7 use gxx-4.8.5 by default
+       # URL_HASH MD5=1
        GIT_REPOSITORY https://github.com/alicevision/SuiteSparse
        GIT_TAG fix/gmp_mpfr  # based on v5.8.1
        # DOWNLOAD_DIR ${BUILD_DIR}/download/suitesparse
@@ -336,12 +341,8 @@ endif()
 # Add ceres-solver: A Nonlinear Least Squares Minimizer
 set(CERES_TARGET ceres)
 ExternalProject_Add(${CERES_TARGET}
-    # TODO: update ceres to 2.0
-    #URL https://github.com/ceres-solver/ceres-solver/archive/2.0.0.tar.gz
-    #URL_HASH MD5=94246057ac520313e3b582c45a30db6e
-       # URL https://github.com/ceres-solver/ceres-solver/archive/1.14.0.tar.gz
-       GIT_REPOSITORY https://github.com/alicevision/ceres-solver
-       GIT_TAG compatibility_gcc_4  # specific commit from the WIP 2.0 version with a fix for gcc-4
+       GIT_REPOSITORY https://github.com/ceres-solver/ceres-solver
+       GIT_TAG 31008453fe979f947e594df15a7e254d6631881b  # 2021/10/06
        PREFIX ${BUILD_DIR}
        BUILD_IN_SOURCE 0
        BUILD_ALWAYS 0
@@ -358,24 +359,10 @@ set(CERES_CMAKE_FLAGS ${SUITESPARSE_CMAKE_FLAGS} -DCeres_DIR=${CMAKE_INSTALL_PRE
 # Add OpenEXR
 set(OPENEXR_TARGET openexr)
 ExternalProject_Add(${OPENEXR_TARGET}
-      # vfxplatform CY2020: 2.4.x, but we use 2.5.x to avoid cmake issues
-      #URL https://github.com/openexr/openexr/archive/v2.4.1.tar.gz
-      #URL_HASH MD5=f7f7f893cf38786f88c306dec127113f
-      URL https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.4.tar.gz
-      URL_HASH MD5=e84577f884f05f7432b235432dfec455
+      # vfxplatform CY2022: 3.1.x
+      URL https://github.com/AcademySoftwareFoundation/openexr/archive/v3.1.2.tar.gz
+      URL_HASH MD5=2e976f5fb610abb6f75d8f20014cf72a
       DOWNLOAD_DIR ${BUILD_DIR}/download/openexr
-      # URL https://github.com/openexr/openexr/archive/v2.2.1.tar.gz
-      # The release 2.2.1 has troubles with C++17, which breaks compilation with recent compilers.
-      # The problem has been fixed https://github.com/openexr/openexr/issues/235
-      # but there is no release yet, so we use the development version.
-      # GIT_REPOSITORY https://github.com/openexr/openexr
-      # Use the latest commit with g++4.X compatibility
-      # GIT_TAG 74b5c1dc2dfbdce74987a57f5e011dc711f9ca65
-      # Finally use a custom version for a cmake fix
-      # GIT_REPOSITORY https://github.com/alicevision/openexr
-      # GIT_TAG develop_compatibility_gxx4
-      # GIT_REPOSITORY https://github.com/openexr/openexr
-      # GIT_TAG a12937f6d7650d4fb81b469900ee2fd4c082c208
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
       BUILD_ALWAYS 0
@@ -384,7 +371,7 @@ ExternalProject_Add(${OPENEXR_TARGET}
       BINARY_DIR ${BUILD_DIR}/openexr_build
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
       CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DOPENEXR_BUILD_PYTHON_LIBS=OFF -DOPENEXR_ENABLE_TESTS=OFF ${ZLIB_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> <SOURCE_DIR>
-      BUILD_COMMAND $(MAKE)
+      BUILD_COMMAND VERBOSE=1 $(MAKE)
       DEPENDS ${ZLIB_TARGET}
       )
 set(ILMBASE_CMAKE_FLAGS -DILMBASE_ROOT=${CMAKE_INSTALL_PREFIX} -DILMBASE_INCLUDE_PATH=${CMAKE_INSTALL_PREFIX}/include/OpenEXR)
@@ -394,8 +381,8 @@ set(OPENEXR_CMAKE_FLAGS ${ILMBASE_CMAKE_FLAGS} -DOPENEXR_ROOT=${CMAKE_INSTALL_PR
 if(AV_BUILD_TIFF)
 set(TIFF_TARGET tiff)
 ExternalProject_Add(${TIFF_TARGET}
-       URL http://download.osgeo.org/libtiff/tiff-4.2.0.tar.gz
-       URL_HASH MD5=2bbf6db1ddc4a59c89d6986b368fc063
+       URL http://download.osgeo.org/libtiff/tiff-4.3.0.tar.gz
+       URL_HASH MD5=0a2e4744d1426a8fc8211c0cdbc3a1b3
        DOWNLOAD_DIR ${BUILD_DIR}/download/tiff
        PREFIX ${BUILD_DIR}
        BUILD_IN_SOURCE 0
@@ -440,8 +427,8 @@ if(AV_BUILD_JPEG)
 set(JPEG_TARGET turbojpeg)
 # Add turbojpeg
 ExternalProject_Add(${JPEG_TARGET}
-       URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.0.6.tar.gz
-       URL_HASH MD5=22aad1e0772cd797306a87428dd744c7
+       URL https://github.com/libjpeg-turbo/libjpeg-turbo/archive/2.1.1.tar.gz
+       URL_HASH MD5=167d52e2348b6f1af33c70f63197edd8
        DOWNLOAD_DIR ${BUILD_DIR}/download/libjpeg-turbo
        PREFIX ${BUILD_DIR}
        BUILD_IN_SOURCE 0
@@ -499,14 +486,11 @@ endif()
 
 # Add Boost
 set(BOOST_TARGET boost)
+# vfxplatform CY2021: 1.73
+# vfxplatform CY2022: 1.76
 ExternalProject_Add(${BOOST_TARGET}
-      # vfxplatform CY2020: 1.70
-      URL https://github.com/alicevision/AliceVisionDependencies/releases/download/boost-src-1.70.0/boost_1_70_0.tar.bz2
-      #    http://sourceforge.net/projects/boost/files/boost/1.70.0/boost_1_70_0.tar.bz2
-      #    https://dl.bintray.com/boostorg/release/1.70.0/source/boost_1_70_0.tar.gz
-      # GIT_REPOSITORY https://github.com/boostorg/boost.git
-      # GIT_TAG boost-1.70.0
-      URL_HASH MD5=242ecc63507711d6706b9b0c0d0c7d4f
+      URL https://github.com/alicevision/AliceVisionDependencies/releases/download/boost-src-1.76.0/boost_1_76_0.tar.bz2
+      URL_HASH MD5=33334dd7f862e8ac9fe1cc7c6584fb6d # 1.76
       DOWNLOAD_DIR ${BUILD_DIR}/download/boost
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
@@ -554,7 +538,7 @@ if(AV_BUILD_FFMPEG)
 # )
 ExternalProject_add(libvpx
       GIT_REPOSITORY https://chromium.googlesource.com/webm/libvpx.git
-      GIT_TAG v1.9.0
+      GIT_TAG v1.10.0
       GIT_PROGRESS ON
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
@@ -568,8 +552,8 @@ ExternalProject_add(libvpx
 
 set(FFMPEG_TARGET ffmpeg)
 ExternalProject_add(${FFMPEG_TARGET}
-      URL http://ffmpeg.org/releases/ffmpeg-4.3.1.tar.bz2
-      URL_HASH MD5=804707549590e90880e8ecd4e5244fd8
+      URL http://ffmpeg.org/releases/ffmpeg-4.4.tar.bz2
+      URL_HASH MD5=aa46d2168f30becd4fd3b22d2e8a91ec
       DOWNLOAD_DIR ${BUILD_DIR}/download/ffmpeg
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
@@ -599,8 +583,8 @@ endif()
 # Add OpenImageIO
 set(OPENIMAGEIO_TARGET openimageio)
 ExternalProject_Add(${OPENIMAGEIO_TARGET}
-      URL https://github.com/OpenImageIO/oiio/archive/Release-2.2.11.1.tar.gz
-      URL_HASH MD5=43eb3e6cc6ca1cbfd55bbb2f19688c95
+      URL https://github.com/OpenImageIO/oiio/archive/refs/tags/v2.3.7.2.tar.gz
+      URL_HASH MD5=3a6fe4e0b45e611dad378f99b44a696b
       DOWNLOAD_DIR ${BUILD_DIR}/download/oiio
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
@@ -611,7 +595,9 @@ ExternalProject_Add(${OPENIMAGEIO_TARGET}
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
       CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS}
             -DCMAKE_PREFIX_PATH=${CMAKE_INSTALL_PREFIX}
-            -DBOOST_ROOT=${CMAKE_INSTALL_PREFIX} -DOIIO_BUILD_TESTS:BOOL=OFF
+            -DBOOST_ROOT=${CMAKE_INSTALL_PREFIX}
+            -DOIIO_BUILD_TESTS:BOOL=OFF
+            -DOIIO_BUILD_TOOLS:BOOL=OFF
             -DILMBASE_HOME=${CMAKE_INSTALL_PREFIX}
             -DOPENEXR_HOME=${CMAKE_INSTALL_PREFIX}
             ${TIFF_CMAKE_FLAGS} ${ZLIB_CMAKE_FLAGS} ${PNG_CMAKE_FLAGS} ${JPEG_CMAKE_FLAGS} ${LIBRAW_CMAKE_FLAGS} ${OPENEXR_CMAKE_FLAGS}
@@ -635,9 +621,9 @@ set(OPENIMAGEIO_CMAKE_FLAGS -DOpenImageIO_DIR=${CMAKE_INSTALL_PREFIX})
 # Add Alembic: I/O for Point Cloud and Cameras
 set(ALEMBIC_TARGET alembic)
 ExternalProject_Add(${ALEMBIC_TARGET}
-      # vfxplatform CY2020 1.7.x
-      URL https://github.com/alembic/alembic/archive/1.7.16.tar.gz
-      URL_HASH MD5=effcc86e42fe6605588e3de57bde6677
+      # vfxplatform CY2022 1.8.x
+      URL https://github.com/alembic/alembic/archive/1.8.3.tar.gz
+      URL_HASH MD5=2cd8d6e5a3ac4a014e24a4b04f4fadf9
       DOWNLOAD_DIR ${BUILD_DIR}/download/alembic
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
@@ -655,8 +641,8 @@ set(ALEMBIC_CMAKE_FLAGS -DAlembic_DIR:PATH=${CMAKE_INSTALL_PREFIX}/lib/cmake/Ale
 if(AV_BUILD_OPENCV)
 set(OPENCV_TARGET opencv)
 ExternalProject_Add(opencv_contrib
-  URL https://github.com/opencv/opencv_contrib/archive/4.5.2.zip
-  URL_MD5 1f5218d9c47994cb38bc018596534e4d
+  URL https://github.com/opencv/opencv_contrib/archive/4.5.3.zip
+  URL_MD5 bdf41b61fbb998e118ffd2e81437d44f
   DOWNLOAD_DIR ${BUILD_DIR}/download/opencv_contrib
   SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/opencv_contrib
   BUILD_ALWAYS 0
@@ -667,8 +653,8 @@ ExternalProject_Add(opencv_contrib
 )
 ExternalProject_Add(${OPENCV_TARGET}
   DEPENDS opencv_contrib ${TBB_TARGET} ${ZLIB_TARGET} ${OPENEXR_TARGET} ${TIFF_TARGET} ${PNG_TARGET} ${JPEG_TARGET} ${LIBRAW_TARGET} ${FFMPEG_TARGET}
-  URL https://github.com/opencv/opencv/archive/4.5.2.zip
-  URL_MD5 f100177ab3e7b884f490cba4cff8e074
+  URL https://github.com/opencv/opencv/archive/4.5.3.zip
+  URL_MD5 e4e25de494ba3dfb676c9f51d7c853fb
   DOWNLOAD_DIR ${BUILD_DIR}/download/opencv
   UPDATE_COMMAND ""
   BUILD_IN_SOURCE 0
@@ -711,8 +697,7 @@ if(AV_BUILD_CCTAG)
 set(CCTAG_TARGET cctag)
 ExternalProject_Add(${CCTAG_TARGET}
       GIT_REPOSITORY https://github.com/alicevision/CCTag
-      # GIT_TAG boost-no-cxx11-constexpr
-      GIT_TAG ba0daba0ff1e2c4e2698220ab6ccfc06e5ede589
+      GIT_TAG a0f4630d018ac9026299e3443ff3cde64f850dc8
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
       BUILD_ALWAYS 0
@@ -731,16 +716,18 @@ endif()
 if(AV_BUILD_APRILTAG)
 set(APRILTAG_TARGET apriltag)
 ExternalProject_Add(${APRILTAG_TARGET}
-      GIT_REPOSITORY https://github.com/AprilRobotics/apriltag
-      GIT_TAG a0b37ad165d1908fc0c400898f28fb4bb16deb1b
+      # GIT_REPOSITORY https://github.com/AprilRobotics/apriltag
+      # GIT_TAG v3.1.7
+      GIT_REPOSITORY https://github.com/alicevision/apriltag.git
+      GIT_TAG 25ccfab4230a35fb000814c9c1749d9902173012  # commit 2021/10/26
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
       BUILD_ALWAYS 0
       UPDATE_COMMAND ""
       SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/apriltag
       BINARY_DIR ${BUILD_DIR}/apriltag_build
       INSTALL_DIR ${CMAKE_INSTALL_PREFIX}
-      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
+      CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DBUILD_PYTHON_WRAPPER=OFF -DOpenCV_FOUND=OFF -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> <SOURCE_DIR>
       BUILD_COMMAND $(MAKE)
       )
 set(APRILTAG_CMAKE_FLAGS -Dapriltag_DIR:PATH=${CMAKE_INSTALL_PREFIX}/share/apriltag/cmake)
@@ -751,7 +738,7 @@ if(AV_BUILD_POPSIFT)
 set(POPSIFT_TARGET popsift)
 ExternalProject_Add(${POPSIFT_TARGET}
       GIT_REPOSITORY https://github.com/alicevision/popsift
-      GIT_TAG 5bbd332f94a280535d54928ced9c3fb74f16a3fb  #v1.0.0-rc3
+      GIT_TAG 4c22d41579c17d7326938929c00c54cfa01a4592
       PREFIX ${BUILD_DIR}
       BUILD_IN_SOURCE 0
       BUILD_ALWAYS 0

INSTALL.md

@@ -32,7 +32,7 @@ AliceVision depends on external libraries:
 * [Ceres >= 1.10.0](https://github.com/ceres-solver/ceres-solver)
 * [Eigen >= 3.3.4](https://gitlab.com/libeigen/eigen)
 * [Geogram >= 1.7.5](https://gforge.inria.fr/frs/?group_id=5833)
-* [OpenEXR >= 2.4.0](https://github.com/AcademySoftwareFoundation/openexr)
+* [OpenEXR >= 2.5](https://github.com/AcademySoftwareFoundation/openexr)
 * [OpenImageIO >= 2.1.0](https://github.com/OpenImageIO/oiio)
 * [zlib](https://www.zlib.net)
 

docker/Dockerfile_centos_deps

@@ -60,17 +60,18 @@ RUN $YUM_INSTALL centos-release-scl-rh && \
 # SHELL [ "/usr/bin/scl", "enable", "devtoolset-6" ]
 ENV PATH="/opt/rh/devtoolset-6/root/usr/bin:${PATH}" \
     LD_LIBRARY_PATH="/opt/rh/devtoolset-6/root/usr/lib:/opt/rh/devtoolset-6/root/usr/lib64:/opt/rh/devtoolset-6/root/usr/lib64/dyninst:${LD_LIBRARY_PATH}" \
-    MAKE=/opt/rh/devtoolset-6/root/usr/bin/make
+    MAKE=/opt/rh/devtoolset-6/root/usr/bin/make \
+    CMAKE_VERSION=3.21.3
 
 COPY dl/vlfeat_K80L3.SIFT.tree ${AV_INSTALL}/share/aliceVision/
 RUN echo "export ALICEVISION_VOCTREE=${AV_INSTALL}/share/aliceVision/vlfeat_K80L3.SIFT.tree" > /etc/profile.d/alicevision.sh
 
-# Manually install cmake 3.16
+# Manually install cmake
 WORKDIR /opt
-COPY dl/cmake-3.16.3.tar.gz /tmp
-RUN tar zxf /tmp/cmake-3.16.3.tar.gz && \
-    rm /tmp/cmake-3.16.3.tar.gz && \
-    cd cmake-3.16.3 && \
+COPY dl/cmake-${CMAKE_VERSION}.tar.gz /tmp
+RUN tar zxf /tmp/cmake-${CMAKE_VERSION}.tar.gz && \
+    rm /tmp/cmake-${CMAKE_VERSION}.tar.gz && \
+    cd cmake-${CMAKE_VERSION} && \
     ./bootstrap --parallel="$(nproc)" --prefix=/usr/local  -- -DCMAKE_BUILD_TYPE:STRING=Release -DCMAKE_USE_OPENSSL:BOOL=ON && \
     make -j"$(nproc)" && \
     make install
@@ -91,28 +92,29 @@ RUN cmake "${AV_DEV}" \
 RUN mkdir -p "${AV_INSTALL}/lib" && \
 	ln -s lib "${AV_INSTALL}/lib64"
 
-#RUN make -j"$(nproc)" zlib
-#RUN make -j"$(nproc)" geogram
-#RUN make -j"$(nproc)" tbb
-#RUN make -j"$(nproc)" eigen
-#RUN make -j"$(nproc)" opengv
-#RUN make -j"$(nproc)" lapack
-
 RUN test -e /usr/local/cuda/lib64/libcublas.so || ln -s /usr/lib64/libcublas.so /usr/local/cuda/lib64/libcublas.so
-#RUN make -j"$(nproc)" suitesparse
-#RUN make -j"$(nproc)" ceres
-#RUN make -j"$(nproc)" openexr
-#RUN make -j"$(nproc)" tiff
-#RUN make -j"$(nproc)" png
-#RUN make -j"$(nproc)" turbojpeg
-#RUN make -j"$(nproc)" libraw
-#RUN make -j"$(nproc)" boost
-#RUN make -j"$(nproc)" openimageio
-#RUN make -j"$(nproc)" alembic
-#RUN make -j"$(nproc)" popsift
-#RUN make -j"$(nproc)" ffmpeg
-#RUN make -j"$(nproc)" opencv
-#RUN make -j"$(nproc)" cctag
+
+# RUN make -j"$(nproc)" cctag
+# RUN make -j"$(nproc)" openexr
+# RUN make -j"$(nproc)" tbb
+# RUN make -j"$(nproc)" assimp
+# RUN make -j"$(nproc)" zlib
+# RUN make -j"$(nproc)" geogram
+# RUN make -j"$(nproc)" eigen
+# RUN make -j"$(nproc)" opengv
+# RUN make -j"$(nproc)" lapack
+# RUN make -j"$(nproc)" suitesparse
+# RUN make -j"$(nproc)" ceres
+# RUN make -j"$(nproc)" tiff
+# RUN make -j"$(nproc)" png
+# RUN make -j"$(nproc)" turbojpeg
+# RUN make -j"$(nproc)" libraw
+# RUN make -j"$(nproc)" boost
+# RUN make -j"$(nproc)" openimageio
+# RUN make -j"$(nproc)" alembic
+# RUN make -j"$(nproc)" popsift
+# RUN make -j"$(nproc)" ffmpeg
+# RUN make -j"$(nproc)" opencv
 
 RUN cmake --build . -j "$(nproc)" && \
     mv "${AV_INSTALL}/bin" "${AV_INSTALL}/bin-deps" && \