diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 6a38ba674c..1c5a608f7f 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -22,7 +22,7 @@ jobs: build-linux: runs-on: ubuntu-latest container: - image: alicevision/alicevision-deps:ci-2022-09-28-centos7-cuda11.3.1 + image: alicevision/alicevision-deps:ci-2022-12-06-centos7-cuda11.3.1 env: DEPS_INSTALL_DIR: /opt/AliceVision_install BUILD_TYPE: Release diff --git a/CMakeLists.txt b/CMakeLists.txt index 7eaf09f345..82c054c23c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,7 +134,9 @@ ExternalProject_Add(${ZLIB_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/zlib BINARY_DIR ${BUILD_DIR}/zlib_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) set(ZLIB_CMAKE_FLAGS -DZLIB_ROOT=${CMAKE_INSTALL_PREFIX}) @@ -156,7 +158,10 @@ ExternalProject_Add(${ASSIMP_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/assimp BINARY_DIR ${BUILD_DIR}/assimp_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ASSIMP_BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${ASSIMP_BUILD_OPTIONS} + -DCMAKE_INSTALL_PREFIX:PATH= + ) set(ASSIMP_CMAKE_FLAGS -DAssimp_DIR:PATH=${CMAKE_INSTALL_PREFIX}/lib/cmake/assimp-${ASSIMP_AV_VERSION}) endif() @@ -182,7 +187,16 @@ ExternalProject_Add(${GEOGRAM_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/geogram BINARY_DIR ${BUILD_DIR}/geogram_internal_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DVORPALINE_PLATFORM=${VORPALINE_PLATFORM} -DGEOGRAM_WITH_HLBFGS=OFF -DGEOGRAM_WITH_TETGEN=OFF -DGEOGRAM_WITH_GRAPHICS=OFF -DGEOGRAM_WITH_EXPLORAGRAM=OFF -DGEOGRAM_WITH_LUA=OFF -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${ZLIB_CMAKE_FLAGS} + -DVORPALINE_PLATFORM=${VORPALINE_PLATFORM} + -DGEOGRAM_WITH_HLBFGS=OFF + -DGEOGRAM_WITH_TETGEN=OFF + -DGEOGRAM_WITH_GRAPHICS=OFF + -DGEOGRAM_WITH_EXPLORAGRAM=OFF + -DGEOGRAM_WITH_LUA=OFF + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${ZLIB_TARGET} ) @@ -279,7 +293,10 @@ ExternalProject_Add(${EIGEN_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/eigen BINARY_DIR ${BUILD_DIR}/eigen_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${EIGEN_CMAKE_ALIGNMENT_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${EIGEN_CMAKE_ALIGNMENT_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) @@ -302,7 +319,12 @@ ExternalProject_Add(${EXPAT_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/expat BINARY_DIR ${BUILD_DIR}/libexpat_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DEXPAT_BUILD_DOCS:BOOL=OFF -DEXPAT_BUILD_EXAMPLES:BOOL=OFF -DEXPAT_BUILD_TOOLS:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH= /expat + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DEXPAT_BUILD_DOCS:BOOL=OFF + -DEXPAT_BUILD_EXAMPLES:BOOL=OFF + -DEXPAT_BUILD_TOOLS:BOOL=OFF + -DCMAKE_INSTALL_PREFIX:PATH= + /expat BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) @@ -318,7 +340,10 @@ ExternalProject_Add(${OPENGV_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/opengv BINARY_DIR ${BUILD_DIR}/opengv_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${EIGEN_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${EIGEN_CMAKE_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${EIGEN_TARGET} ) @@ -338,7 +363,9 @@ ExternalProject_Add(${LAPACK_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/lapack BINARY_DIR ${BUILD_DIR}/lapack_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${TBB_TARGET} ) @@ -415,7 +442,15 @@ ExternalProject_Add(${CERES_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/ceres-solver BINARY_DIR ${BUILD_DIR}/ceres_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${SUITESPARSE_CMAKE_FLAGS} -DSUITESPARSE:BOOL=ON -DLAPACK:BOOL=ON ${EIGEN_CMAKE_FLAGS} -DMINIGLOG=ON -DBUILD_EXAMPLES:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${SUITESPARSE_CMAKE_FLAGS} + -DSUITESPARSE:BOOL=ON + -DLAPACK:BOOL=ON + ${EIGEN_CMAKE_FLAGS} + -DMINIGLOG=ON + -DBUILD_EXAMPLES:BOOL=OFF + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${EIGEN_TARGET} ${SUITESPARSE_TARGET} ) @@ -490,7 +525,11 @@ if(AV_BUILD_PNG) BINARY_DIR ${BUILD_DIR}/png_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} # CONFIGURE_COMMAND /configure --prefix= - CONFIGURE_COMMAND ${CMAKE_COMMAND} -DPNG_ARM_NEON=${AV_PNG_ARM_NEON} ${CMAKE_CORE_BUILD_FLAGS} ${ZLIB_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${ZLIB_CMAKE_FLAGS} + -DPNG_ARM_NEON=${AV_PNG_ARM_NEON} + -DCMAKE_INSTALL_PREFIX= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${ZLIB_TARGET} ) @@ -512,7 +551,10 @@ ExternalProject_Add(${JPEG_TARGET} BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/turbojpeg_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} # CONFIGURE_COMMAND cd && autoreconf -fiv && ./configure --prefix= - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ZLIB_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${ZLIB_CMAKE_FLAGS} + -DCMAKE_INSTALL_PREFIX= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${ZLIB_TARGET} ) @@ -551,7 +593,16 @@ ExternalProject_Add(${LIBRAW_TARGET} # Native libraw configure script doesn't work on centos 7 (autoconf 2.69) # CONFIGURE_COMMAND autoconf && ./configure --enable-jpeg --enable-openmp --disable-examples --prefix= # Use cmake build system (not maintained by libraw devs) - CONFIGURE_COMMAND cp _cmake/CMakeLists.txt . && cp -rf _cmake/cmake . && ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DENABLE_OPENMP=${AV_USE_OPENMP} -DENABLE_LCMS=ON -DENABLE_EXAMPLES=OFF ${ZLIB_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= -DINSTALL_CMAKE_MODULE_PATH:PATH=/cmake + CONFIGURE_COMMAND cp _cmake/CMakeLists.txt . && + cp -rf _cmake/cmake . && + ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DENABLE_OPENMP=${AV_USE_OPENMP} + -DENABLE_LCMS=ON + -DENABLE_EXAMPLES=OFF + ${ZLIB_CMAKE_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + -DINSTALL_CMAKE_MODULE_PATH:PATH=/cmake + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS libraw_cmake ${ZLIB_TARGET} ) @@ -563,8 +614,9 @@ set(BOOST_TARGET boost) # vfxplatform CY2021: 1.73 # vfxplatform CY2022: 1.76 ExternalProject_Add(${BOOST_TARGET} - 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 + #URL https://github.com/alicevision/AliceVisionDependencies/releases/download/boost-src-1.80.0/boost_1_80_0.tar.bz2 + URL https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2 + URL_HASH MD5=df7dc2fc6de751753198a5bf70210da7 DOWNLOAD_DIR ${BUILD_DIR}/download/boost PREFIX ${BUILD_DIR} BUILD_IN_SOURCE 0 @@ -573,7 +625,7 @@ ExternalProject_Add(${BOOST_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/boost BINARY_DIR ${BUILD_DIR}/boost_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND cd && ./bootstrap.${SCRIPT_EXTENSION} --prefix= --with-libraries=atomic,container,date_time,exception,filesystem,graph,iostreams,log,math,program_options,regex,serialization,system,test,thread,stacktrace,timer + CONFIGURE_COMMAND cd && ./bootstrap.${SCRIPT_EXTENSION} --prefix= --with-libraries=atomic,container,date_time,exception,filesystem,graph,iostreams,json,log,math,program_options,regex,serialization,system,test,thread,stacktrace,timer BUILD_COMMAND cd && ./b2 --prefix= variant=${DEPS_CMAKE_BUILD_TYPE_LOWERCASE} link=shared threading=multi -j8 INSTALL_COMMAND cd && ./b2 variant=${DEPS_CMAKE_BUILD_TYPE_LOWERCASE} link=shared threading=multi install DEPENDS ${ZLIB_TARGET} @@ -706,7 +758,11 @@ ExternalProject_Add(${ALEMBIC_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/alembic BINARY_DIR ${BUILD_DIR}/alembic_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${ZLIB_CMAKE_FLAGS} ${ILMBASE_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${ZLIB_CMAKE_FLAGS} + ${ILMBASE_CMAKE_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${BOOST_TARGET} ${OPENEXR_TARGET} ${ZLIB_TARGET} ) @@ -736,7 +792,7 @@ ExternalProject_Add(${OPENCV_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/opencv BINARY_DIR ${BUILD_DIR}/opencv_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DOPENCV_EXTRA_MODULES_PATH=${CMAKE_CURRENT_BINARY_DIR}/opencv_contrib/modules ${ZLIB_CMAKE_FLAGS} ${TBB_CMAKE_FLAGS} ${TIFF_CMAKE_FLAGS} ${PNG_CMAKE_FLAGS} ${JPEG_CMAKE_FLAGS} ${LIBRAW_CMAKE_FLAGS} @@ -759,6 +815,7 @@ ExternalProject_Add(${OPENCV_TARGET} -DWITH_OPENCL=OFF -DBUILD_TESTS=OFF -DBUILD_LIST=core,improc,photo,objdetect,video,imgcodecs,videoio,features2d,xfeatures2d,version,mcc,optflow + -DCMAKE_INSTALL_PREFIX:PATH= BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) @@ -779,7 +836,17 @@ ExternalProject_Add(${CCTAG_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/cctag BINARY_DIR ${BUILD_DIR}/cctag_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${BOOST_CMAKE_FLAGS} ${CUDA_CMAKE_FLAGS} ${OPENCV_CMAKE_FLAGS} ${EIGEN_CMAKE_FLAGS} ${TBB_CMAKE_FLAGS} -DCCTAG_WITH_CUDA:BOOL=${AV_USE_CUDA} -DCCTAG_BUILD_TESTS=OFF -DCCTAG_BUILD_APPS=OFF -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${BOOST_CMAKE_FLAGS} + ${CUDA_CMAKE_FLAGS} + ${OPENCV_CMAKE_FLAGS} + ${EIGEN_CMAKE_FLAGS} + ${TBB_CMAKE_FLAGS} + -DCCTAG_WITH_CUDA:BOOL=${AV_USE_CUDA} + -DCCTAG_BUILD_TESTS=OFF + -DCCTAG_BUILD_APPS=OFF + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${BOOST_TARGET} ${CUDA_TARGET} ${OPENCV_TARGET} ${EIGEN_TARGET} ${TBB_TARGET} ) @@ -801,7 +868,11 @@ ExternalProject_Add(${APRILTAG_TARGET} 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} -DBUILD_PYTHON_WRAPPER=OFF -DOpenCV_FOUND=OFF -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DBUILD_PYTHON_WRAPPER=OFF + -DOpenCV_FOUND=OFF + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) set(APRILTAG_CMAKE_FLAGS -Dapriltag_DIR:PATH=${CMAKE_INSTALL_PREFIX}/share/apriltag/cmake) @@ -820,7 +891,12 @@ ExternalProject_Add(${POPSIFT_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/popsift BINARY_DIR ${BUILD_DIR}/popsift_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} ${BOOST_CMAKE_FLAGS} ${CUDA_CMAKE_FLAGS} -DPopSift_BUILD_EXAMPLES:BOOL=OFF -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + ${BOOST_CMAKE_FLAGS} + ${CUDA_CMAKE_FLAGS} + -DPopSift_BUILD_EXAMPLES:BOOL=OFF + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${BOOST_TARGET} ${CUDA_TARGET} ) @@ -839,7 +915,9 @@ ExternalProject_Add(${COINUTILS_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/coinutils BINARY_DIR ${BUILD_DIR}/coinutils_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) set(COINUTILS_CMAKE_FLAGS -DCoinUtils_DIR:PATH=${CMAKE_INSTALL_PREFIX}/share/coinutils) @@ -857,7 +935,9 @@ ExternalProject_Add(${OSI_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/osi BINARY_DIR ${BUILD_DIR}/osi_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${COINUTILS_TARGET} ) @@ -876,7 +956,9 @@ ExternalProject_Add(${CLP_TARGET} SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/clp BINARY_DIR ${BUILD_DIR}/clp_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} DEPENDS ${COINUTILS_TARGET} ${OSI_TARGET} ) @@ -898,7 +980,9 @@ if(AV_BUILD_PCL) SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LZ4_TARGET} BINARY_DIR ${BUILD_DIR}/${LZ4_TARGET}_build INSTALL_DIR ${CMAKE_INSTALL_PREFIX} - CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= + CONFIGURE_COMMAND ${CMAKE_COMMAND} ${CMAKE_CORE_BUILD_FLAGS} + -DCMAKE_INSTALL_PREFIX:PATH= + BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} ) set(LZ4_CMAKE_FLAGS -Dlz4_DIR:PATH=${CMAKE_INSTALL_PREFIX}/lib/cmake/lz4/) @@ -949,11 +1033,17 @@ if(AV_BUILD_PCL) ${PNG_CMAKE_FLAGS} ${CUDA_CMAKE_FLAGS} -DWITH_CUDA:BOOL=${AV_USE_CUDA} + -DWITH_OPENGL:BOOL=OFF + -DWITH_OPENMP:BOOL=ON + -DWITH_LIBUSB:BOOL=OFF + -DWITH_VTK:BOOL=OFF + -DWITH_PCAP:BOOL=OFF ${FLANN_CMAKE_FLAGS} ${LZ4_CMAKE_FLAGS} + ${ZLIB_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX:PATH= BUILD_COMMAND $(MAKE) -j${AV_BUILD_DEPENDENCIES_PARALLEL} - DEPENDS ${FLANN_TARGET} ${LZ4_TARGET} ${EIGEN_TARGET} ${BOOST_TARGET} ${PNG_TARGET} ${CUDA_TARGET} + DEPENDS ${FLANN_TARGET} ${LZ4_TARGET} ${EIGEN_TARGET} ${BOOST_TARGET} ${PNG_TARGET} ${CUDA_TARGET} ${ZLIB_TARGET} ) set(PCL_CMAKE_FLAGS -DPCL_DIR:PATH=${CMAKE_INSTALL_PREFIX}/share/pcl-1.12/)