Skip to content

Commit

Permalink
Update cmake minimum version to 3.20 on all platforms
Browse files Browse the repository at this point in the history
  • Loading branch information
behda committed Mar 5, 2024
1 parent 450b971 commit f3fac5b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# Copyright (c) Microsoft Corporation.
# Licensed under the MIT License.

if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")
cmake_minimum_required(VERSION 3.20)
else()
cmake_minimum_required(VERSION 3.16)
endif()
cmake_minimum_required(VERSION 3.20)

# Disable in-source builds to prevent source tree corruption.
if("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
Expand Down
14 changes: 9 additions & 5 deletions scripts/qns.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
FROM martenseemann/quic-network-simulator-endpoint@sha256:2ec0a19a54f4547f068a81afcb3e92251b8808934eb86e5cb6919d91c4958791 as source
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update -y \
&& apt-get install -y \
build-essential \
cmake \
liblttng-ust-dev \
libnuma-dev \
&& apt-get install -y ca-certificates gpg wget \
&& test -f /usr/share/doc/kitware-archive-keyring/copyright \
|| wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | tee /usr/share/keyrings/kitware-archive-keyring.gpg >/dev/null \
&& echo 'deb [signed-by=/usr/share/keyrings/kitware-archive-keyring.gpg] https://apt.kitware.com/ubuntu/ focal main' | tee /etc/apt/sources.list.d/kitware.list >/dev/null \
&& apt-get update -y \
&& test -f /usr/share/doc/kitware-archive-keyring/copyright \
|| rm /usr/share/keyrings/kitware-archive-keyring.gpg \
&& apt-get install -y kitware-archive-keyring \
&& apt-get install -y build-essential cmake liblttng-ust-dev libnuma-dev \
&& apt-get clean
COPY . /src

Expand Down

0 comments on commit f3fac5b

Please sign in to comment.