From b6e7c829ee516121f4b620b1a87376a9410d3f19 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Thu, 6 Oct 2022 10:29:35 -0500 Subject: [PATCH] Rolling CMake required to 3.20 - CMake 3.15 required to remove /W3 by default - CMake 3.20 required for preset support --- CMakeLists.txt | 2 +- external/CMakeLists.txt | 2 +- external/freetype-gl.cmake | 2 +- external/hsluv-c.cmake | 2 +- external/mapbox-gl-native.cmake | 2 +- external/stb.cmake | 2 +- scwx-qt/CMakeLists.txt | 2 +- scwx-qt/scwx-qt.cmake | 2 +- test/CMakeLists.txt | 2 +- test/test.cmake | 2 +- wxdata/CMakeLists.txt | 2 +- wxdata/wxdata.cmake | 2 ++ 12 files changed, 13 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 21e0232e..33eb5bd6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set(PROJECT_NAME supercell-wx) project(${PROJECT_NAME} C CXX) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 221957b0..7e7c320a 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set(PROJECT_NAME scwx-external) set_property(DIRECTORY diff --git a/external/freetype-gl.cmake b/external/freetype-gl.cmake index 76756bb0..057a1ec7 100644 --- a/external/freetype-gl.cmake +++ b/external/freetype-gl.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set(PROJECT_NAME scwx-freetype-gl) find_package(OpenGL REQUIRED) diff --git a/external/hsluv-c.cmake b/external/hsluv-c.cmake index 5a74a156..0129d39d 100644 --- a/external/hsluv-c.cmake +++ b/external/hsluv-c.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set(PROJECT_NAME scwx-hsluv-c) set(HSLUV_C_TESTS OFF) diff --git a/external/mapbox-gl-native.cmake b/external/mapbox-gl-native.cmake index d8bc00e0..bc160dfe 100644 --- a/external/mapbox-gl-native.cmake +++ b/external/mapbox-gl-native.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set(PROJECT_NAME scwx-mbgl) set(gtest_disable_pthreads ON) diff --git a/external/stb.cmake b/external/stb.cmake index 52bbf5f2..c26bedaf 100644 --- a/external/stb.cmake +++ b/external/stb.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.20) set(PROJECT_NAME scwx-stb) set(STB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/stb PARENT_SCOPE) diff --git a/scwx-qt/CMakeLists.txt b/scwx-qt/CMakeLists.txt index 8a3114c5..967fb747 100644 --- a/scwx-qt/CMakeLists.txt +++ b/scwx-qt/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set_property(DIRECTORY APPEND diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake index 51ba42cf..c5eed0a8 100644 --- a/scwx-qt/scwx-qt.cmake +++ b/scwx-qt/scwx-qt.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) project(scwx-qt LANGUAGES CXX) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2ef7354d..d1db7851 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set_property(DIRECTORY APPEND diff --git a/test/test.cmake b/test/test.cmake index 7bf3d295..c7c4bd67 100644 --- a/test/test.cmake +++ b/test/test.cmake @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) project(scwx-test CXX) include(GoogleTest) diff --git a/wxdata/CMakeLists.txt b/wxdata/CMakeLists.txt index 018d792b..845ab381 100644 --- a/wxdata/CMakeLists.txt +++ b/wxdata/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.11) +cmake_minimum_required(VERSION 3.20) set_property(DIRECTORY APPEND diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake index de57a39b..778f74e1 100644 --- a/wxdata/wxdata.cmake +++ b/wxdata/wxdata.cmake @@ -1,3 +1,5 @@ +cmake_minimum_required(VERSION 3.20) + project(scwx-data) find_package(AWSSDK)