From 12d76f604a3977cd1193286c3f36cde3d9b5a1e0 Mon Sep 17 00:00:00 2001
From: Antoine Regimbeau <antoine.regimbeau@c-s.fr>
Date: Fri, 1 Feb 2019 13:28:06 +0100
Subject: [PATCH] Use of environnement variable
---
CI/Dockerfile | 2 +-
CI/Dockerfile.shark1.3.4 | 1 +
CI/configure_option.cmake | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/CI/Dockerfile b/CI/Dockerfile
index 10319e3a49..0892f6a1b4 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 dedc86bde8..faa9e7debe 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 560ff6dac8..3e780d2613 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")
--
GitLab