diff --git a/CMakeLists.txt b/CMakeLists.txt index 70d50150..d0a0fc6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.25) +cmake_minimum_required(VERSION 3.28) project("impacto") diff --git a/docker/impacto-switch/Dockerfile b/docker/impacto-switch/Dockerfile index 2277018f..0121e6c8 100644 --- a/docker/impacto-switch/Dockerfile +++ b/docker/impacto-switch/Dockerfile @@ -2,10 +2,14 @@ FROM devkitpro/toolchain-base LABEL org.opencontainers.image.source https://github.com/committeeofzero/impacto -RUN echo "Updating CMAKE" && \ - echo "deb http://deb.debian.org/debian bullseye-backports main" >> /etc/apt/sources.list && \ - apt-get update && \ - apt-get install -y cmake/bullseye-backports +# Install latest cmake +RUN echo "Removing older version of cmake" && \ + apt remove --purge --auto-remove -y cmake +ADD https://github.com/Kitware/CMake/releases/download/v3.31.3/cmake-3.31.3-linux-x86_64.sh /cmake-3.31.3-linux-x86_64.sh +RUN mkdir /opt/cmake +RUN sh /cmake-3.31.3-linux-x86_64.sh --prefix=/opt/cmake --skip-license +RUN ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake +RUN cmake --version RUN dkp-pacman -Syyu --noconfirm && \ dkp-pacman -S --needed --noconfirm switch-dev && \