diff --git a/scripts/cmake/ConanSetup.cmake b/scripts/cmake/ConanSetup.cmake index 205f6c7e79999cc8025b34152c43565739c9838b..601e7f64f15a82723e6938b848c2b6e740a13423 100644 --- a/scripts/cmake/ConanSetup.cmake +++ b/scripts/cmake/ConanSetup.cmake @@ -92,7 +92,7 @@ if(OGS_USE_NETCDF) set(CONAN_REQUIRES ${CONAN_REQUIRES} netcdf-cxx/4.3.1@bilke/testing) endif() -conan_check(VERSION 1.19.2) +conan_check(VERSION 1.20.0) message(STATUS "Third-party libraries:") foreach(LIB ${OGS_LIBS}) diff --git a/scripts/docker/Dockerfile.clang.full b/scripts/docker/Dockerfile.clang.full index a73db1a224c728335b69d7d23df732757d50dcf9..e4fbb7acde8278c5be1bb0684c23a8f4604165e9 100644 --- a/scripts/docker/Dockerfile.clang.full +++ b/scripts/docker/Dockerfile.clang.full @@ -31,8 +31,10 @@ RUN apt-get update -y && \ wget && \ rm -rf /var/lib/apt/lists/* RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh && \ + mkdir -p /usr/local && \ /bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh +ENV PATH=/usr/local/bin:$PATH # OGS base building block # Python @@ -84,12 +86,12 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.19.2 +RUN pip3 install conan==1.20.5 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.19.2 + org.opengeosys.pm.conan.version=1.20.5 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # Include-what-you-use for clang version 8 @@ -100,11 +102,13 @@ RUN apt-get update -y && \ llvm-8-dev \ zlib1g-dev && \ rm -rf /var/lib/apt/lists/* +# https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/include-what-you-use/include-what-you-use/archive/clang_8.0.tar.gz && \ mkdir -p /var/tmp && tar -x -f /var/tmp/clang_8.0.tar.gz -C /var/tmp -z && \ - mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/iwyy -DIWYU_LLVM_ROOT_PATH=/usr/lib/llvm-8 /var/tmp/include-what-you-use-clang_8.0 && \ - cmake --build /var/tmp/build --target install -- -j$(nproc) && \ - rm -rf /var/tmp/clang_8.0.tar.gz /var/tmp/build /var/tmp/include-what-you-use-clang_8.0 + mkdir -p /var/tmp/include-what-you-use-clang_8.0/build && cd /var/tmp/include-what-you-use-clang_8.0/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/iwyy -D IWYU_LLVM_ROOT_PATH=/usr/lib/llvm-8 /var/tmp/include-what-you-use-clang_8.0 && \ + cmake --build /var/tmp/include-what-you-use-clang_8.0/build --target all -- -j$(nproc) && \ + cmake --build /var/tmp/include-what-you-use-clang_8.0/build --target install -- -j$(nproc) && \ + rm -rf /var/tmp/clang_8.0.tar.gz /var/tmp/include-what-you-use-clang_8.0 ENV PATH=/usr/local/iwyy/bin:$PATH # Package manager Conan building block diff --git a/scripts/docker/Dockerfile.gcc.full b/scripts/docker/Dockerfile.gcc.full index 85ee2907655f862e3ac13e4da89ffeb091970a7b..7f2a0b05c4b1620b310d36a9b3bde65295591efb 100644 --- a/scripts/docker/Dockerfile.gcc.full +++ b/scripts/docker/Dockerfile.gcc.full @@ -24,8 +24,10 @@ RUN apt-get update -y && \ wget && \ rm -rf /var/lib/apt/lists/* RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh && \ + mkdir -p /usr/local && \ /bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh +ENV PATH=/usr/local/bin:$PATH # OGS base building block # Python @@ -77,20 +79,22 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.19.2 +RUN pip3 install conan==1.20.5 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.19.2 + org.opengeosys.pm.conan.version=1.20.5 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # cppcheck version 1.87 +# https://github.com/danmar/cppcheck/archive/1.87.tar.gz RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \ mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \ - mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \ - cmake --build /var/tmp/build --target install -- -j$(nproc) && \ - rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87 + mkdir -p /var/tmp/cppcheck-1.87/build && cd /var/tmp/cppcheck-1.87/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -D CMAKE_BUILD_TYPE=Release /var/tmp/cppcheck-1.87 && \ + cmake --build /var/tmp/cppcheck-1.87/build --target all -- -j$(nproc) && \ + cmake --build /var/tmp/cppcheck-1.87/build --target install -- -j$(nproc) && \ + rm -rf /var/tmp/1.87.tar.gz /var/tmp/cppcheck-1.87 ENV PATH=/usr/local/cppcheck/bin:$PATH RUN apt-get update -y && \ diff --git a/scripts/docker/Dockerfile.gcc.gui b/scripts/docker/Dockerfile.gcc.gui index b96f2497d188b121632606f84c3ece6df6ab77c3..62a986576f187be3e66194edb4ce9d937de6f656 100644 --- a/scripts/docker/Dockerfile.gcc.gui +++ b/scripts/docker/Dockerfile.gcc.gui @@ -24,8 +24,10 @@ RUN apt-get update -y && \ wget && \ rm -rf /var/lib/apt/lists/* RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://cmake.org/files/v3.12/cmake-3.12.4-Linux-x86_64.sh && \ + mkdir -p /usr/local && \ /bin/sh /var/tmp/cmake-3.12.4-Linux-x86_64.sh --prefix=/usr/local --skip-license && \ rm -rf /var/tmp/cmake-3.12.4-Linux-x86_64.sh +ENV PATH=/usr/local/bin:$PATH # OGS base building block # Python @@ -85,20 +87,22 @@ RUN apt-get update -y && \ python3-setuptools \ python3-wheel && \ rm -rf /var/lib/apt/lists/* -RUN pip3 install conan==1.19.2 +RUN pip3 install conan==1.20.5 RUN mkdir -p /opt/conan && \ chmod 777 /opt/conan ENV CONAN_USER_HOME=/opt/conan LABEL org.opengeosys.pm=conan \ - org.opengeosys.pm.conan.version=1.19.2 + org.opengeosys.pm.conan.version=1.20.5 LABEL org.opengeosys.pm.conan.user_home=/opt/conan # cppcheck version 1.87 +# https://github.com/danmar/cppcheck/archive/1.87.tar.gz RUN mkdir -p /var/tmp && wget -q -nc --no-check-certificate -P /var/tmp https://github.com/danmar/cppcheck/archive/1.87.tar.gz && \ mkdir -p /var/tmp && tar -x -f /var/tmp/1.87.tar.gz -C /var/tmp -z && \ - mkdir -p /var/tmp/build && cd /var/tmp/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -DCMAKE_BUILD_TYPE=RELEASE /var/tmp/cppcheck-1.87 && \ - cmake --build /var/tmp/build --target install -- -j$(nproc) && \ - rm -rf /var/tmp/1.87.tar.gz /var/tmp/build /var/tmp/cppcheck-1.87 + mkdir -p /var/tmp/cppcheck-1.87/build && cd /var/tmp/cppcheck-1.87/build && cmake -DCMAKE_INSTALL_PREFIX=/usr/local/cppcheck -D CMAKE_BUILD_TYPE=Release /var/tmp/cppcheck-1.87 && \ + cmake --build /var/tmp/cppcheck-1.87/build --target all -- -j$(nproc) && \ + cmake --build /var/tmp/cppcheck-1.87/build --target install -- -j$(nproc) && \ + rm -rf /var/tmp/1.87.tar.gz /var/tmp/cppcheck-1.87 ENV PATH=/usr/local/cppcheck/bin:$PATH # pip