From f55ceda04ca4c64b894e64635f7cd92384e6bc9a Mon Sep 17 00:00:00 2001
From: Moritz Maxeiner <mm@ucw.sh>
Date: Tue, 3 Mar 2020 19:23:13 +0100
Subject: [PATCH] centos-7,windows-1809: Update CMake to 3.16.4
---
centos-7/Dockerfile | 2 +-
windows-1809/base/Dockerfile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/centos-7/Dockerfile b/centos-7/Dockerfile
index c1cd13b..6d79d36 100644
--- a/centos-7/Dockerfile
+++ b/centos-7/Dockerfile
@@ -15,7 +15,7 @@ ADD bash/toolchain.sh /etc/profile.d/toolchain.sh
ADD bash/ld-library-path.sh /etc/profile.d/ld-library-path.sh
# CMake
-RUN version=3.15.5 && \
+RUN version=3.16.4 && \
yum install -y \
curl-devel \
expat-devel \
diff --git a/windows-1809/base/Dockerfile b/windows-1809/base/Dockerfile
index 60556d2..f83b7ec 100644
--- a/windows-1809/base/Dockerfile
+++ b/windows-1809/base/Dockerfile
@@ -12,7 +12,7 @@ ADD powershell/00-Must-Run.ps1 /Windows/System32/WindowsPowerShell/v1.0/profile.
RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; \
Invoke-Expression ((New-Object Net.WebClient).DownloadString('https://chocolatey.org/install.ps1')); \
Must-Run choco install -y dotnetfx --version 4.7.2.20180712; \
- Must-Run choco install -y cmake --version 3.15.5 --installargs "ADD_CMAKE_TO_PATH=System"; \
+ Must-Run choco install -y cmake --version 3.16.4 --installargs "ADD_CMAKE_TO_PATH=System"; \
Must-Run choco install -y kitware-ninja --version 1.8.2.8127911; \
Must-Run choco install -y \
git \
--
GitLab