diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 757903e646..1aa0ab9e99 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -51,7 +51,6 @@ jobs: -DCMAKE_INSTALL_PREFIX:PATH=$PWD/../../AV_install \ -DTARGET_ARCHITECTURE=core \ -DALICEVISION_BUILD_TESTS:BOOL=ON \ - -DALICEVISION_BUILD_EXAMPLES:BOOL=ON \ -DALICEVISION_BUILD_SWIG_BINDING:BOOL=ON \ -DALICEVISION_USE_OPENCV:BOOL=ON \ -DALICEVISION_USE_CUDA:BOOL=ON \ @@ -216,7 +215,6 @@ jobs: -DTARGET_ARCHITECTURE=core -DCMAKE_INSTALL_PREFIX=${{ env.ALICEVISION_ROOT }} -DALICEVISION_BUILD_TESTS=ON - -DALICEVISION_BUILD_EXAMPLES=OFF -DALICEVISION_USE_OPENCV=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_CCTAG=OFF @@ -226,6 +224,8 @@ jobs: -DALICEVISION_BUILD_STEREOPHOTOMETRY=OFF -DALICEVISION_BUILD_SEGMENTATION=OFF -DBOOST_NO_CXX11=ON + -DCUDA_NVCC_FLAGS=--allow-unsupported-compiler;-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH + # This input tells run-cmake to consume the vcpkg.cmake toolchain file set by run-vcpkg. cmakeBuildType: Release buildWithCMake: true diff --git a/INSTALL.md b/INSTALL.md index 76b113daab..467a891a48 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -254,9 +254,6 @@ CMake Options * `ALICEVISION_BUILD_DOC` (default `AUTO`) Build AliceVision documentation -* `ALICEVISION_BUILD_EXAMPLES` (default `ON`) - Build AliceVision samples applications (aliceVision software are still built) - * `ALICEVISION_BUILD_COVERAGE` (default `OFF`) Enable code coverage generation (gcc only) @@ -279,9 +276,9 @@ Linux compilation cmake -DCMAKE_BUILD_TYPE=Release . ../AliceVision ``` -If you want enable unit tests and examples to the build: +If you want enable unit tests to the build: ```bash -cmake -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_TESTS=ON -DALICEVISION_BUILD_EXAMPLES=ON ../AliceVision +cmake -DCMAKE_BUILD_TYPE=Release -DALICEVISION_BUILD_TESTS=ON ../AliceVision ``` In order to use the MOSEK 6 back-end for the linear programming aliceVision module: @@ -343,11 +340,10 @@ git clone --recursive https://github.com/alicevision/AliceVision.git mkdir build && cd build cmake -DCMAKE_BUILD_TYPE=Release -G "Xcode" ../AliceVision ``` -If you want enable unit tests and examples to the build: +If you want enable unit tests to the build: ```bash cmake -DCMAKE_BUILD_TYPE=Release \ -DALICEVISION_BUILD_TESTS=ON \ - -DALICEVISION_BUILD_EXAMPLES=ON \ -G "Xcode" \ ../AliceVision xcodebuild -configuration Release diff --git a/docker/Dockerfile_centos b/docker/Dockerfile_centos index b236b226f5..766b156231 100644 --- a/docker/Dockerfile_centos +++ b/docker/Dockerfile_centos @@ -36,7 +36,7 @@ RUN cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX:PATH="${AV_INSTALL}" \ -DALICEVISION_BUNDLE_PREFIX="${AV_BUNDLE}" \ -DALICEVISION_USE_ALEMBIC=ON -DMINIGLOG=ON -DALICEVISION_USE_CCTAG=ON -DALICEVISION_USE_APRILTAG=ON -DALICEVISION_USE_OPENCV=ON -DALICEVISION_USE_OPENGV=ON \ - -DALICEVISION_USE_POPSIFT=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_ONNX_GPU=OFF -DALICEVISION_BUILD_DOC=OFF -DALICEVISION_BUILD_EXAMPLES=OFF \ + -DALICEVISION_USE_POPSIFT=ON -DALICEVISION_USE_CUDA=ON -DALICEVISION_USE_ONNX_GPU=OFF -DALICEVISION_BUILD_DOC=OFF \ -DSWIG_DIR="${AV_INSTALL}/share/swig/4.2.0" -DSWIG_EXECUTABLE="${AV_INSTALL}/bin-deps/swig" \ "${AV_DEV}" || (cat "${AV_BUILD}/CMakeFiles/CMakeOutput.log" "${AV_BUILD}/CMakeFiles/CMakeError.log" && false) diff --git a/docker/Dockerfile_ubuntu b/docker/Dockerfile_ubuntu index 109c2bbf0e..339b1b1b2e 100644 --- a/docker/Dockerfile_ubuntu +++ b/docker/Dockerfile_ubuntu @@ -57,7 +57,6 @@ RUN export CPU_CORES=`${AV_DEV}/docker/check-cpu.sh`; \ -DALICEVISION_USE_CUDA:BOOL=ON \ -DALICEVISION_USE_ONNX_GPU:BOOL=OFF \ -DALICEVISION_BUILD_DOC:BOOL=OFF \ - -DALICEVISION_BUILD_EXAMPLES:BOOL=OFF \ -DALICEVISION_BUILD_SWIG_BINDING:BOOL=ON \ -DSWIG_DIR:PATH="${AV_INSTALL}/share/swig/4.2.0" -DSWIG_EXECUTABLE:PATH="${AV_INSTALL}/bin-deps/swig" \ "${AV_DEV}" && \ diff --git a/src/cmake/Dependencies.cmake b/src/cmake/Dependencies.cmake index 1efae6a0f0..0a8282f170 100644 --- a/src/cmake/Dependencies.cmake +++ b/src/cmake/Dependencies.cmake @@ -1420,7 +1420,6 @@ if(AV_BUILD_ALICEVISION) -DALICEVISION_USE_CUDA=${AV_USE_CUDA} -DALICEVISION_BUILD_SWIG_BINDING=${AV_USE_SWIG} -DALICEVISION_BUILD_DOC=OFF - -DALICEVISION_BUILD_EXAMPLES=OFF ${ZLIB_CMAKE_FLAGS} ${ASSIMP_CMAKE_FLAGS}