From 79ca32eedb9adbd0416958c78f9e6c83b7aea1cc Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 14 Feb 2018 12:44:10 +0100
Subject: [PATCH] [CMake] Use LIS from Conan.
---
scripts/cmake/ConanSetup.cmake | 4 ++++
scripts/docker/Dockerfile.clang.full | 8 --------
scripts/docker/Dockerfile.clang.minimal | 8 --------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake
index 3a9a08deeaa..d1dcdcb9bca 100644
--- a/scripts/cmake/ConanSetup.cmake
+++ b/scripts/cmake/ConanSetup.cmake
@@ -40,6 +40,10 @@ if(OGS_USE_PETSC)
set(CONAN_REQUIRES ${CONAN_REQUIRES} petsc/3.8.3@bilke/testing)
endif()
+if(OGS_USE_LIS)
+ set(CONAN_REQUIRES ${CONAN_REQUIRES} lis/1.7.9@bilke/stable)
+endif()
+
if(OGS_BUILD_GUI)
set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable
diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full
index 29158ca568d..6d643bdee44 100644
--- a/scripts/docker/Dockerfile.clang.full
+++ b/scripts/docker/Dockerfile.clang.full
@@ -26,14 +26,6 @@ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/dow
ENV CC=clang-3.9
ENV CXX=clang++-3.9
-# Lis
-RUN curl -L -o lis.tar.gz http://www.ssisc.org/lis/dl/lis-1.7.9.tar.gz \
- && tar xf lis.tar.gz \
- && cd lis-1.7.9 \
- && ./configure \
- && make -j$(nproc) install \
- && cd .. && rm -rf lis-1.7.9 lis.tar.gz
-
# Add user jenkins to the image
RUN adduser --uid 500 --disabled-password --gecos "" jenkins \
# Add user jenkins to sudoers with NOPASSWD
diff --git a/scripts/docker/Dockerfile.clang.minimal b/scripts/docker/Dockerfile.clang.minimal
index 718aa166f51..3cfd2782d40 100644
--- a/scripts/docker/Dockerfile.clang.minimal
+++ b/scripts/docker/Dockerfile.clang.minimal
@@ -26,14 +26,6 @@ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/dow
ENV CC=clang-3.9
ENV CXX=clang++-3.9
-# Lis
-RUN curl -L -o lis.tar.gz http://www.ssisc.org/lis/dl/lis-1.7.9.tar.gz \
- && tar xf lis.tar.gz \
- && cd lis-1.7.9 \
- && ./configure \
- && make -j$(nproc) install \
- && cd .. && rm -rf lis-1.7.9 lis.tar.gz
-
# Add user jenkins to the image
RUN adduser --uid 500 --disabled-password --gecos "" jenkins \
# Add user jenkins to sudoers with NOPASSWD
--
GitLab