diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 3a9a08deeaa337eaee2db6a81879fa14addaa36f..d1dcdcb9bcaeb5dd844fc0c61bb5665b122b1037 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 29158ca568d827a84d82aaaf33e21e4ab98b29bb..6d643bdee4416d8ef000e05fb980b230159b45ad 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 718aa166f51f5089a39563cf90defd656f1cf7f3..3cfd2782d40bfa5b08cde46c2244bbcad8563c5a 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