From 647b57f3ad80ae0f9d56639855dc5282d756237f Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 9 Sep 2025 19:49:55 +0100 Subject: [PATCH 1/2] CMake: Update cotire CMake minimum version to 3.5 --- build/cmake/modules/cotire.cmake | 2 +- build/cmake/modules/cotire_test/CMakeLists.txt | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake index 09b52a629c..58dde58b31 100644 --- a/build/cmake/modules/cotire.cmake +++ b/build/cmake/modules/cotire.cmake @@ -37,7 +37,7 @@ set(__COTIRE_INCLUDED TRUE) if (NOT CMAKE_SCRIPT_MODE_FILE) cmake_policy(PUSH) endif() -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) if (NOT CMAKE_SCRIPT_MODE_FILE) cmake_policy(POP) endif() diff --git a/build/cmake/modules/cotire_test/CMakeLists.txt b/build/cmake/modules/cotire_test/CMakeLists.txt index dd1426208f..ac7a23083d 100644 --- a/build/cmake/modules/cotire_test/CMakeLists.txt +++ b/build/cmake/modules/cotire_test/CMakeLists.txt @@ -1,6 +1,6 @@ # cotire example project -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.5) if (POLICY CMP0058) # Ninja requires custom command byproducts to be explicit @@ -10,11 +10,8 @@ endif() project (CotireExample) set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/..") - -if (NOT CMAKE_VERSION VERSION_LESS "3.1.0") - set (CMAKE_CXX_STANDARD "98") - set (CMAKE_CXX_EXTENSIONS OFF) -endif() +set (CMAKE_CXX_STANDARD "98") +set (CMAKE_CXX_EXTENSIONS OFF) include(cotire) From 47e132ec72bed876938b91773a0bfa4e9a5d03a6 Mon Sep 17 00:00:00 2001 From: Chris Mayo Date: Tue, 9 Sep 2025 19:49:55 +0100 Subject: [PATCH 2/2] CMake: Stop including CMakeParseArguments module A placeholder for compatibility with CMake < 3.5. --- build/cmake/functions.cmake | 1 - build/cmake/modules/cotire.cmake | 1 - 2 files changed, 2 deletions(-) diff --git a/build/cmake/functions.cmake b/build/cmake/functions.cmake index e9e9e0b5e3..3c3f87984a 100644 --- a/build/cmake/functions.cmake +++ b/build/cmake/functions.cmake @@ -8,7 +8,6 @@ ############################################################################# include(CMakeDependentOption) -include(CMakeParseArguments) # For compatibility with CMake < 3.4 include(ExternalProject) include(CMakePrintHelpers) diff --git a/build/cmake/modules/cotire.cmake b/build/cmake/modules/cotire.cmake index 58dde58b31..f3cf30e904 100644 --- a/build/cmake/modules/cotire.cmake +++ b/build/cmake/modules/cotire.cmake @@ -111,7 +111,6 @@ if (POLICY CMP0055) cmake_policy(SET CMP0055 NEW) endif() -include(CMakeParseArguments) include(ProcessorCount) function (cotire_get_configuration_types _configsVar)