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 /lldb | |
| 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 'lldb')
| -rw-r--r-- | lldb/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | lldb/tools/debugserver/CMakeLists.txt | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 20d584c48bad..9ae6722295ac 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/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) @@ -19,13 +19,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) project(lldb) set(LLDB_BUILT_STANDALONE TRUE) set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") - 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() endif() # Must go below project(..) diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt index 4940ea488682..74afea804598 100644 --- a/lldb/tools/debugserver/CMakeLists.txt +++ b/lldb/tools/debugserver/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.13.4) +cmake_minimum_required(VERSION 3.20.0) project(Debugserver LANGUAGES C CXX ASM-ATT) @@ -7,13 +7,6 @@ include(GNUInstallDirs) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) set(LLDB_BUILT_STANDALONE TRUE) - 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() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} |