diff options
| author | Nico Weber <thakis@chromium.org> | 2023-05-17 10:46:45 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2023-05-17 10:53:33 -0400 |
| commit | d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6 (patch) | |
| tree | efbb52b2ca03bfac87b6e9a3ebb106d8428270cb /flang | |
| parent | d9610b4a56c532614545eef5995362e99b776535 (diff) | |
| download | llvm-d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.tar.gz | |
Revert "Reland "[CMake] Bumps minimum version to 3.20.0.""
This reverts commit 65429b9af6a2c99d340ab2dcddd41dab201f399c.
Broke several projects, see https://reviews.llvm.org/D144509#4347562 onwards.
Also reverts follow-up commit "[OpenMP] Compile assembly files as ASM, not C"
This reverts commit 4072c8aee4c89c4457f4f30d01dc9bb4dfa52559.
Also reverts fix attempt "[cmake] Set CMP0091 to fix Windows builds after the cmake_minimum_required bump"
This reverts commit 7d47dac5f828efd1d378ba44a97559114f00fb64.
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, 17 insertions, 3 deletions
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt index 4c0b9a84cc5b..e47456a0fb93 100644 --- a/flang/CMakeLists.txt +++ b/flang/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.20.0) +cmake_minimum_required(VERSION 3.13.4) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) @@ -39,6 +39,13 @@ 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 3116ff68ea26..a81d329b4a5d 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.20.0) + cmake_minimum_required(VERSION 3.13.4) project(FortranDecimal C CXX) diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt index 63d7f9bf2a9d..2a7e74c17553 100644 --- a/flang/runtime/CMakeLists.txt +++ b/flang/runtime/CMakeLists.txt @@ -7,7 +7,14 @@ #===------------------------------------------------------------------------===# if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) - cmake_minimum_required(VERSION 3.20.0) + 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() project(FlangRuntime C CXX) |