Skip to content
Snippets Groups Projects
Commit 79ca32ee authored by Lars Bilke's avatar Lars Bilke
Browse files

[CMake] Use LIS from Conan.

parent ce6fa020
No related branches found
No related tags found
No related merge requests found
...@@ -40,6 +40,10 @@ if(OGS_USE_PETSC) ...@@ -40,6 +40,10 @@ if(OGS_USE_PETSC)
set(CONAN_REQUIRES ${CONAN_REQUIRES} petsc/3.8.3@bilke/testing) set(CONAN_REQUIRES ${CONAN_REQUIRES} petsc/3.8.3@bilke/testing)
endif() endif()
if(OGS_USE_LIS)
set(CONAN_REQUIRES ${CONAN_REQUIRES} lis/1.7.9@bilke/stable)
endif()
if(OGS_BUILD_GUI) if(OGS_BUILD_GUI)
set(CONAN_REQUIRES ${CONAN_REQUIRES} set(CONAN_REQUIRES ${CONAN_REQUIRES}
Shapelib/1.3.0@bilke/stable Shapelib/1.3.0@bilke/stable
......
...@@ -26,14 +26,6 @@ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/dow ...@@ -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 CC=clang-3.9
ENV CXX=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 # Add user jenkins to the image
RUN adduser --uid 500 --disabled-password --gecos "" jenkins \ RUN adduser --uid 500 --disabled-password --gecos "" jenkins \
# Add user jenkins to sudoers with NOPASSWD # Add user jenkins to sudoers with NOPASSWD
......
...@@ -26,14 +26,6 @@ RUN curl -L -o ninja-linux.zip https://github.com/ninja-build/ninja/releases/dow ...@@ -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 CC=clang-3.9
ENV CXX=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 # Add user jenkins to the image
RUN adduser --uid 500 --disabled-password --gecos "" jenkins \ RUN adduser --uid 500 --disabled-password --gecos "" jenkins \
# Add user jenkins to sudoers with NOPASSWD # Add user jenkins to sudoers with NOPASSWD
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment