diff --git a/CI/Dockerfile b/CI/Dockerfile index 10319e3a49d001039928b5ebf7ab44d3e2a33b6d..0892f6a1b43d8c97822c1335a3b48aec644d869a 100644 --- a/CI/Dockerfile +++ b/CI/Dockerfile @@ -60,7 +60,6 @@ RUN apt-get update -y \ libpng-dev \ libqt5opengl5-dev \ libqwt-qt5-dev \ - libshark-dev \ libsvm-dev \ libtinyxml-dev \ qtbase5-dev \ @@ -74,3 +73,4 @@ RUN apt-get update -y \ && rm -rf /var/lib/apt/lists/* ENV PATH /usr/lib/ccache:$PATH +ENV OTB_USE_SHARK OFF diff --git a/CI/Dockerfile.shark1.3.4 b/CI/Dockerfile.shark1.3.4 index dedc86bde8b07996730609239f51303d4d885645..faa9e7debe210662d9425d12b1b5968320babe0d 100644 --- a/CI/Dockerfile.shark1.3.4 +++ b/CI/Dockerfile.shark1.3.4 @@ -121,3 +121,4 @@ COPY --from=shark-provider /usr/local/bin/SharkVersion /usr/bin/ COPY --from=shark-provider /usr/local/lib/cmake/ /usr/lib/cmake/ ENV PATH /usr/lib/ccache:$PATH +ENV OTB_USE_SHARK ON diff --git a/CI/configure_option.cmake b/CI/configure_option.cmake index 560ff6dac82326893289ed67bb9601d04c6e6081..3e780d26139a854b7c924cb5fc2e35b4a54bd4e4 100644 --- a/CI/configure_option.cmake +++ b/CI/configure_option.cmake @@ -27,7 +27,7 @@ OTB_USE_OPENGL:BOOL=ON OTB_USE_OPENMP:BOOL=ON OTB_USE_QT:BOOL=ON OTB_USE_QWT:BOOL=ON -OTB_USE_SHARK:BOOL=ON +OTB_USE_SHARK:BOOL=$ENV{OTB_USESHARK} OTB_USE_SIFTFAST:BOOL=ON OTB_USE_SPTW:BOOL=ON OTB_USE_SSE_FLAGS:BOOL=ON")