From d7788522f2cbd165c7b4e791313fbeff60a1df67 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 14 Mar 2021 12:15:54 +0100 Subject: [PATCH] :arrow_up: Bump CMake to 3.13 This allows us to have variables set in the toolchains which cleans up the main file a bit. --- CMake/mingwcc.cmake | 3 +++ CMake/mingwcc64.cmake | 1 + CMakeLists.txt | 8 +------- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/CMake/mingwcc.cmake b/CMake/mingwcc.cmake index 24e2df525..d56c385a7 100644 --- a/CMake/mingwcc.cmake +++ b/CMake/mingwcc.cmake @@ -17,3 +17,6 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3) + SET(DISABLE_LTO ON) +endif() diff --git a/CMake/mingwcc64.cmake b/CMake/mingwcc64.cmake index 3c6657667..657aaddd6 100644 --- a/CMake/mingwcc64.cmake +++ b/CMake/mingwcc64.cmake @@ -18,3 +18,4 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(SYSTEM_BITS x64) +SET(DISABLE_LTO ON) diff --git a/CMakeLists.txt b/CMakeLists.txt index f23326cd0..b22fe2c0c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) # CMP0083 NEW +cmake_minimum_required(VERSION 3.13) # CMP0083 NEW include(CMake/out_of_tree.cmake) include(CMake/genex.cmake) @@ -58,12 +58,6 @@ else() LANGUAGES C CXX) endif() -if(WIN32 AND NOT CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9.3 OR SYSTEM_BITS MATCHES x64) - SET(DISABLE_LTO ON) - endif() -endif() - # Not a genexp because CMake doesn't support it # https://gitlab.kitware.com/cmake/cmake/-/issues/20546 if(NOT DISABLE_LTO)