From af45ae23e4ef971d08735cddc0534bedeb9fbc44 Mon Sep 17 00:00:00 2001
From: Lava Block <the@lava-block.com>
Date: Fri, 16 Apr 2021 17:30:38 +0200
Subject: [PATCH] CMake 3.20+
---
.appveyor.yml | 9 +++++++++
.travis.yml | 6 +++---
CMakeLists.txt | 2 +-
DOCS.md | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/.appveyor.yml b/.appveyor.yml
index a5f8e4b4..b1c70944 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -9,9 +9,18 @@ matrix:
fast_finish: true
install:
- git submodule update --init --recursive
+ - mkdir C:\projects\deps
+ - cd C:\projects\deps
+ - appveyor DownloadFile https://github.com/Kitware/CMake/releases/download/v3.20.1/cmake-3.20.1-windows-x86_64.zip -FileName cmake.zip
+ - 7z x cmake.zip -oC:\projects\deps > nul
+ - move C:\projects\deps\cmake-* C:\projects\deps\cmake
+ - rm cmake.zip
+ - set PATH=C:\projects\deps\cmake\bin;%PATH%
+ - cd C:\projects\liblava
before_build:
- mkdir build
- cd build
+ - cmake --version
- cmake -G "Visual Studio 16 2019" -A x64 ..
build:
project: $(APPVEYOR_BUILD_FOLDER)\build\$(APPVEYOR_PROJECT_NAME).sln
diff --git a/.travis.yml b/.travis.yml
index b0972c14..676a5e82 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,9 +24,9 @@ before_install:
install:
- DEPS_DIR="${TRAVIS_BUILD_DIR}/deps"
- mkdir ${DEPS_DIR} && cd ${DEPS_DIR}
- - travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.16.2/cmake-3.16.2-Linux-x86_64.tar.gz
- - tar -xvf cmake-3.16.2-Linux-x86_64.tar.gz > /dev/null
- - mv cmake-3.16.2-Linux-x86_64 cmake-install
+ - travis_retry wget --no-check-certificate https://github.com/Kitware/CMake/releases/download/v3.20.1/cmake-3.20.1-linux-x86_64.tar.gz
+ - tar -xvf cmake-3.20.1-linux-x86_64.tar.gz > /dev/null
+ - mv cmake-3.20.1-linux-x86_64 cmake-install
- PATH=${DEPS_DIR}/cmake-install:${DEPS_DIR}/cmake-install/bin:$PATH
- cd ${TRAVIS_BUILD_DIR}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 57167082..ef27bcfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
# copyright : Copyright (c) 2018-present, Lava Block OÜ and contributors
# license : MIT; see accompanying LICENSE file
-cmake_minimum_required(VERSION 3.15)
+cmake_minimum_required(VERSION 3.20)
project(liblava VERSION 0.6.1 LANGUAGES C CXX)
diff --git a/DOCS.md b/DOCS.md
index 6b5930a7..11c7ef4b 100644
--- a/DOCS.md
+++ b/DOCS.md
@@ -376,7 +376,7 @@ int main(int argc, char* argv[]) {
## Requirements
* **C++20** compatible compiler
-* CMake **3.15+**
+* CMake **3.20+**
* [Vulkan SDK](https://vulkan.lunarg.com)
<br />
--
GitLab