suyu/build-environments
26
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #66 from lat9nq/fresh-bump-cmake

Browse source 
fresh: Increase CMake version to 3.22.6
This commit is contained in:
Morph 2022-11-28 22:41:24 -05:00 committed by GitHub
commit 75d1fa4ec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
linux-fresh/Dockerfile
View file

@ -2,7 +2,7 @@ FROM ubuntu:18.04
LABEL maintainer="yuzu" LABEL maintainer="yuzu"
ENV CLANG_VER=14 ENV CLANG_VER=14
ENV CMAKE_VER=3.16.9 ENV CMAKE_VER=3.22.6
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
ENV GCC_VER=11.3.0 ENV GCC_VER=11.3.0
ENV QT_PKG_VER=515 ENV QT_PKG_VER=515
@ -81,9 +81,9 @@ RUN useradd -m -u 1027 -s /bin/bash yuzu && \
# Install CMake from upstream # Install CMake from upstream
# yuzu requires CMake version 3.15, however Ubuntu only provides 3.10 to Bionic. # yuzu requires CMake version 3.15, however Ubuntu only provides 3.10 to Bionic.
RUN cd /tmp && \ RUN cd /tmp && \
wget --no-verbose https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-Linux-x86_64.tar.gz && \ wget --no-verbose https://github.com/Kitware/CMake/releases/download/v${CMAKE_VER}/cmake-${CMAKE_VER}-linux-x86_64.tar.gz && \
tar xvf cmake-${CMAKE_VER}-Linux-x86_64.tar.gz && \ tar xvf cmake-${CMAKE_VER}-linux-x86_64.tar.gz && \
cp -rv cmake-${CMAKE_VER}-Linux-x86_64/* /usr && \ cp -rv cmake-${CMAKE_VER}-linux-x86_64/* /usr && \
rm -rf cmake-* rm -rf cmake-*
# Install Boost 1.79.0 from yuzu-emu/ext-linux-bin # Install Boost 1.79.0 from yuzu-emu/ext-linux-bin