From 98564b0aae7df4b9bf9cf52b4a06c44c4b6d1fff Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Wed, 20 Jan 2021 20:14:12 +0000 Subject: [PATCH] cmake: move cmake_minimum_required bump to extern/CMakeLists.txt --- CMakeLists.txt | 2 +- extern/CMakeLists.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e7e59713a..5a497733c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ project(OpenMW) -cmake_minimum_required(VERSION 3.11) # CMP0083 NEW +cmake_minimum_required(VERSION 3.1.0) # CMP0083 NEW set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index b426ac4bff..646558897e 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -16,6 +16,8 @@ macro(FetchContent_MakeAvailableExcludeFromAll) endmacro() if(NOT OPENMW_USE_SYSTEM_BULLET) + cmake_minimum_required(VERSION 3.11) # for FetchContent + set(BUILD_BULLET3 OFF CACHE BOOL "") set(BUILD_EXTRAS OFF CACHE BOOL "") set(BUILD_OPENGL3_DEMOS OFF CACHE BOOL "") @@ -50,6 +52,8 @@ if(NOT OPENMW_USE_SYSTEM_BULLET) endif() if(NOT OPENMW_USE_SYSTEM_MYGUI) + cmake_minimum_required(VERSION 3.11) # for FetchContent + set(MYGUI_STATIC ON CACHE BOOL "") set(MYGUI_RENDERSYSTEM 4 CACHE STRING "") @@ -71,6 +75,8 @@ if(NOT OPENMW_USE_SYSTEM_MYGUI) endif() if(NOT OPENMW_USE_SYSTEM_OSG) + cmake_minimum_required(VERSION 3.11) # for FetchContent + set(OSG_STATIC ON CACHE BOOL "") set(DYNAMIC_OPENTHREADS OFF CACHE BOOL "")