diff options
author | Mark de Wever <koraq@xs4all.nl> | 2023-05-13 11:42:25 +0200 |
---|---|---|
committer | Mark de Wever <koraq@xs4all.nl> | 2023-05-13 11:42:25 +0200 |
commit | 65429b9af6a2c99d340ab2dcddd41dab201f399c (patch) | |
tree | da714cefe7a0c581cedbabc7d35ebda9f5165e9d /flang | |
parent | 946e7aa6dce96fd9538e8866a9adb8024b53d8f4 (diff) | |
download | llvm-65429b9af6a2c99d340ab2dcddd41dab201f399c.tar.gz |
Reland "[CMake] Bumps minimum version to 3.20.0."
The owner of the last two failing buildbots updated CMake.
This reverts commit e8e8707b4aa6e4cc04c0cffb2de01d2de71165fc.
Diffstat (limited to 'flang')
-rw-r--r-- | flang/CMakeLists.txt | 9 | ||||
-rw-r--r-- | flang/lib/Decimal/CMakeLists.txt | 2 | ||||
-rw-r--r-- | flang/runtime/CMakeLists.txt | 9 |
3 files changed, 3 insertions, 17 deletions
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index ab254871fbb4..66a09703c87d 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -39,13 +39,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) message("Building Flang as a standalone project.") project(Flang) set(FLANG_STANDALONE_BUILD ON) - if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0") - message(WARNING - "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the " - "minimum version of CMake required to build LLVM will become 3.20.0, and " - "using an older CMake will become an error. Please upgrade your CMake to " - "at least 3.20.0 now to avoid issues in the future!") - endif() else() set(FLANG_STANDALONE_BUILD OFF) endif() diff --git a/flang/lib/Decimal/CMakeLists.txt b/flang/lib/Decimal/CMakeLists.txt index a81d329b4a5d..3116ff68ea26 100644 --- a/flang/lib/Decimal/CMakeLists.txt +++ b/flang/lib/Decimal/CMakeLists.txt @@ -1,5 +1,5 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - cmake_minimum_required(VERSION 3.13.4) + cmake_minimum_required(VERSION 3.20.0) project(FortranDecimal C CXX) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index 2a7e74c17553..63d7f9bf2a9d 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -7,14 +7,7 @@ #===------------------------------------------------------------------------===# if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - cmake_minimum_required(VERSION 3.13.4) - if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0") - message(WARNING - "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the " - "minimum version of CMake required to build LLVM will become 3.20.0, and " - "using an older CMake will become an error. Please upgrade your CMake to " - "at least 3.20.0 now to avoid issues in the future!") - endif() + cmake_minimum_required(VERSION 3.20.0) project(FlangRuntime C CXX) |