<div dir="ltr">Can you please take a look or revert?<div><a href="https://lab.llvm.org/buildbot/#/builders/127/builds/48118">https://lab.llvm.org/buildbot/#/builders/127/builds/48118</a><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Sat, 13 May 2023 at 02:43, Mark de Wever via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Mark de Wever<br>
Date: 2023-05-13T11:42:25+02:00<br>
New Revision: 65429b9af6a2c99d340ab2dcddd41dab201f399c<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/65429b9af6a2c99d340ab2dcddd41dab201f399c" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/65429b9af6a2c99d340ab2dcddd41dab201f399c</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/65429b9af6a2c99d340ab2dcddd41dab201f399c.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/65429b9af6a2c99d340ab2dcddd41dab201f399c.diff</a><br>
<br>
LOG: Reland "[CMake] Bumps minimum version to 3.20.0."<br>
<br>
The owner of the last two failing buildbots updated CMake.<br>
<br>
This reverts commit e8e8707b4aa6e4cc04c0cffb2de01d2de71165fc.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
bolt/runtime/CMakeLists.txt<br>
clang/CMakeLists.txt<br>
clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt<br>
compiler-rt/CMakeLists.txt<br>
compiler-rt/lib/builtins/CMakeLists.txt<br>
compiler-rt/lib/crt/CMakeLists.txt<br>
flang/CMakeLists.txt<br>
flang/lib/Decimal/CMakeLists.txt<br>
flang/runtime/CMakeLists.txt<br>
libc/CMakeLists.txt<br>
libc/examples/hello_world/CMakeLists.txt<br>
libclc/CMakeLists.txt<br>
libcxx/CMakeLists.txt<br>
libcxxabi/CMakeLists.txt<br>
libunwind/CMakeLists.txt<br>
libunwind/src/CMakeLists.txt<br>
lld/CMakeLists.txt<br>
lldb/CMakeLists.txt<br>
lldb/tools/debugserver/CMakeLists.txt<br>
llvm-libgcc/CMakeLists.txt<br>
llvm/CMakeLists.txt<br>
llvm/docs/CMake.rst<br>
llvm/docs/GettingStarted.rst<br>
llvm/docs/ReleaseNotes.rst<br>
mlir/CMakeLists.txt<br>
mlir/examples/standalone/CMakeLists.txt<br>
openmp/CMakeLists.txt<br>
openmp/cmake/DetectTestCompiler/CMakeLists.txt<br>
openmp/docs/SupportAndFAQ.rst<br>
openmp/libompd/src/CMakeLists.txt<br>
openmp/libomptarget/plugins/remote/src/CMakeLists.txt<br>
openmp/tools/Modules/FindOpenMPTarget.cmake<br>
openmp/tools/Modules/README.rst<br>
polly/CMakeLists.txt<br>
pstl/CMakeLists.txt<br>
runtimes/CMakeLists.txt<br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff --git a/bolt/runtime/CMakeLists.txt b/bolt/runtime/CMakeLists.txt<br>
index 7d177f7c598b1..37a894702206a 100644<br>
--- a/bolt/runtime/CMakeLists.txt<br>
+++ b/bolt/runtime/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
include(CheckIncludeFiles)<br>
include(GNUInstallDirs)<br>
<br>
<br>
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt<br>
index fd8558a16f81d..ef69a68e460a0 100644<br>
--- a/clang/CMakeLists.txt<br>
+++ b/clang/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
@@ -11,13 +11,6 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake<br>
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
project(Clang)<br>
set(CLANG_BUILT_STANDALONE TRUE)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
endif()<br>
<br>
# Must go below project(..)<br>
<br>
diff --git a/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt b/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt<br>
index 007ad4530d6dc..95c6fdb610e0f 100644<br>
--- a/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt<br>
+++ b/clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt<br>
@@ -1,6 +1,6 @@<br>
project(exec C)<br>
<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
include(CheckCCompilerFlag)<br>
check_c_compiler_flag("-std=c99" C99_SUPPORTED)<br>
<br>
diff --git a/compiler-rt/CMakeLists.txt b/compiler-rt/CMakeLists.txt<br>
index c5a7b2478e504..8485fe9232d00 100644<br>
--- a/compiler-rt/CMakeLists.txt<br>
+++ b/compiler-rt/CMakeLists.txt<br>
@@ -3,20 +3,13 @@<br>
# An important constraint of the build is that it only produces libraries<br>
# based on the ability of the host toolchain to target various platforms.<br>
<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
# Check if compiler-rt is built as a standalone project.<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)<br>
project(CompilerRT C CXX ASM)<br>
set(COMPILER_RT_STANDALONE_BUILD TRUE)<br>
set_property(GLOBAL PROPERTY USE_FOLDERS ON)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
endif()<br>
<br>
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")<br>
<br>
diff --git a/compiler-rt/lib/builtins/CMakeLists.txt b/compiler-rt/lib/builtins/CMakeLists.txt<br>
index a302306cc3021..c3e22a8f354fc 100644<br>
--- a/compiler-rt/lib/builtins/CMakeLists.txt<br>
+++ b/compiler-rt/lib/builtins/CMakeLists.txt<br>
@@ -3,14 +3,7 @@<br>
# architecture-specific code in various subdirectories.<br>
<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)<br>
project(CompilerRTBuiltins C ASM)<br>
<br>
diff --git a/compiler-rt/lib/crt/CMakeLists.txt b/compiler-rt/lib/crt/CMakeLists.txt<br>
index 771652f438f81..32fd61b1fa11e 100644<br>
--- a/compiler-rt/lib/crt/CMakeLists.txt<br>
+++ b/compiler-rt/lib/crt/CMakeLists.txt<br>
@@ -1,12 +1,5 @@<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)<br>
project(CompilerRTCRT C)<br>
<br>
diff --git a/flang/CMakeLists.txt b/flang/CMakeLists.txt<br>
index ab254871fbb48..66a09703c87d3 100644<br>
--- a/flang/CMakeLists.txt<br>
+++ b/flang/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
@@ -39,13 +39,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
message("Building Flang as a standalone project.")<br>
project(Flang)<br>
set(FLANG_STANDALONE_BUILD ON)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
else()<br>
set(FLANG_STANDALONE_BUILD OFF)<br>
endif()<br>
<br>
diff --git a/flang/lib/Decimal/CMakeLists.txt b/flang/lib/Decimal/CMakeLists.txt<br>
index a81d329b4a5de..3116ff68ea262 100644<br>
--- a/flang/lib/Decimal/CMakeLists.txt<br>
+++ b/flang/lib/Decimal/CMakeLists.txt<br>
@@ -1,5 +1,5 @@<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
<br>
project(FortranDecimal C CXX)<br>
<br>
<br>
diff --git a/flang/runtime/CMakeLists.txt b/flang/runtime/CMakeLists.txt<br>
index 2a7e74c175533..63d7f9bf2a9d6 100644<br>
--- a/flang/runtime/CMakeLists.txt<br>
+++ b/flang/runtime/CMakeLists.txt<br>
@@ -7,14 +7,7 @@<br>
#===------------------------------------------------------------------------===#<br>
<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
<br>
project(FlangRuntime C CXX)<br>
<br>
<br>
diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt<br>
index e0e5b69b47cf8..622851695084a 100644<br>
--- a/libc/CMakeLists.txt<br>
+++ b/libc/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
# Include LLVM's cmake policies.<br>
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)<br>
<br>
diff --git a/libc/examples/hello_world/CMakeLists.txt b/libc/examples/hello_world/CMakeLists.txt<br>
index 89bf35c0340d0..1561cdc1c3bf5 100644<br>
--- a/libc/examples/hello_world/CMakeLists.txt<br>
+++ b/libc/examples/hello_world/CMakeLists.txt<br>
@@ -1,5 +1,5 @@<br>
project(hello_world)<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
include(../examples.cmake)<br>
<br>
add_example(<br>
<br>
diff --git a/libclc/CMakeLists.txt b/libclc/CMakeLists.txt<br>
index 0eda12670b710..6a21544b40e8f 100644<br>
--- a/libclc/CMakeLists.txt<br>
+++ b/libclc/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
project( libclc VERSION 0.2.0 LANGUAGES CXX C)<br>
<br>
<br>
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt<br>
index 40c5a9c0a0a68..a003d1e98048c 100644<br>
--- a/libcxx/CMakeLists.txt<br>
+++ b/libcxx/CMakeLists.txt<br>
@@ -4,7 +4,7 @@<br>
#===============================================================================<br>
# Setup Project<br>
#===============================================================================<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")<br>
<br>
<br>
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt<br>
index ae89796f6fcf8..218558e3a8f42 100644<br>
--- a/libcxxabi/CMakeLists.txt<br>
+++ b/libcxxabi/CMakeLists.txt<br>
@@ -4,7 +4,7 @@<br>
# Setup Project<br>
#===============================================================================<br>
<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")<br>
<br>
<br>
diff --git a/libunwind/CMakeLists.txt b/libunwind/CMakeLists.txt<br>
index 6f12a160307d1..bd49dfbe53b37 100644<br>
--- a/libunwind/CMakeLists.txt<br>
+++ b/libunwind/CMakeLists.txt<br>
@@ -2,7 +2,7 @@<br>
# Setup Project<br>
#===============================================================================<br>
<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")<br>
<br>
<br>
diff --git a/libunwind/src/CMakeLists.txt b/libunwind/src/CMakeLists.txt<br>
index 2eabbe06d1d1d..ef34174438727 100644<br>
--- a/libunwind/src/CMakeLists.txt<br>
+++ b/libunwind/src/CMakeLists.txt<br>
@@ -30,8 +30,7 @@ set(LIBUNWIND_ASM_SOURCES<br>
# CMake doesn't work correctly with assembly on AIX. Workaround by compiling<br>
# as C files as well.<br>
if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR<br>
- (MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR<br>
- (${CMAKE_SYSTEM_NAME} MATCHES "AIX"))<br>
+ (MINGW AND CMAKE_VERSION VERSION_LESS 3.17))<br>
set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)<br>
endif()<br>
<br>
<br>
diff --git a/lld/CMakeLists.txt b/lld/CMakeLists.txt<br>
index 1e9e47393196d..a24330d2f18e9 100644<br>
--- a/lld/CMakeLists.txt<br>
+++ b/lld/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
@@ -11,13 +11,6 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake<br>
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
project(lld)<br>
set(LLD_BUILT_STANDALONE TRUE)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
endif()<br>
<br>
# Must go below project(..)<br>
<br>
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt<br>
index 20d584c48bad1..9ae6722295ac3 100644<br>
--- a/lldb/CMakeLists.txt<br>
+++ b/lldb/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
@@ -19,13 +19,6 @@ if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
project(lldb)<br>
set(LLDB_BUILT_STANDALONE TRUE)<br>
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "")<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
endif()<br>
<br>
# Must go below project(..)<br>
<br>
diff --git a/lldb/tools/debugserver/CMakeLists.txt b/lldb/tools/debugserver/CMakeLists.txt<br>
index 4940ea488682a..74afea804598b 100644<br>
--- a/lldb/tools/debugserver/CMakeLists.txt<br>
+++ b/lldb/tools/debugserver/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
project(Debugserver LANGUAGES C CXX ASM-ATT)<br>
<br>
@@ -7,13 +7,6 @@ include(GNUInstallDirs)<br>
<br>
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
set(LLDB_BUILT_STANDALONE TRUE)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
<br>
set(CMAKE_MODULE_PATH<br>
${CMAKE_MODULE_PATH}<br>
<br>
diff --git a/llvm-libgcc/CMakeLists.txt b/llvm-libgcc/CMakeLists.txt<br>
index 91c40bbf1cf3f..de42d908c3711 100644<br>
--- a/llvm-libgcc/CMakeLists.txt<br>
+++ b/llvm-libgcc/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libunwind")<br>
message(FATAL_ERROR "llvm-libgcc requires being built in a monorepo layout with libunwind available")<br>
<br>
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt<br>
index ce6cd1a52d3a1..5e2f08f0d2c8f 100644<br>
--- a/llvm/CMakeLists.txt<br>
+++ b/llvm/CMakeLists.txt<br>
@@ -1,13 +1,6 @@<br>
# See docs/CMake.html for instructions about how to build LLVM with CMake.<br>
<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
-if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
-endif()<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake<br>
<br>
diff --git a/llvm/docs/CMake.rst b/llvm/docs/CMake.rst<br>
index 6eb90c46c52e2..a403b3500764f 100644<br>
--- a/llvm/docs/CMake.rst<br>
+++ b/llvm/docs/CMake.rst<br>
@@ -34,7 +34,7 @@ Quick start<br>
We use here the command-line, non-interactive CMake interface.<br>
<br>
#. `Download <<a href="http://www.cmake.org/cmake/resources/software.html" rel="noreferrer" target="_blank">http://www.cmake.org/cmake/resources/software.html</a>>`_ and install<br>
- CMake. Version 3.13.4 is the minimum required.<br>
+ CMake. Version 3.20.0 is the minimum required.<br>
<br>
#. Open a shell. Your development tools must be reachable from this shell<br>
through the PATH environment variable.<br>
@@ -911,7 +911,7 @@ and uses them to build a simple application ``simple-tool``.<br>
<br>
.. code-block:: cmake<br>
<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
project(SimpleProject)<br>
<br>
find_package(LLVM REQUIRED CONFIG)<br>
<br>
diff --git a/llvm/docs/GettingStarted.rst b/llvm/docs/GettingStarted.rst<br>
index 2324d5a9eba5d..a3e0903122e09 100644<br>
--- a/llvm/docs/GettingStarted.rst<br>
+++ b/llvm/docs/GettingStarted.rst<br>
@@ -280,7 +280,7 @@ uses the package and provides other details.<br>
=========================================================== ============ ==========================================<br>
Package Version Notes<br>
=========================================================== ============ ==========================================<br>
-`CMake <<a href="http://cmake.org/" rel="noreferrer" target="_blank">http://cmake.org/</a>>`__ >=3.13.4 Makefile/workspace generator<br>
+`CMake <<a href="http://cmake.org/" rel="noreferrer" target="_blank">http://cmake.org/</a>>`__ >=3.20.0 Makefile/workspace generator<br>
`GCC <<a href="http://gcc.gnu.org/" rel="noreferrer" target="_blank">http://gcc.gnu.org/</a>>`_ >=7.1.0 C/C++ compiler\ :sup:`1`<br>
`python <<a href="http://www.python.org/" rel="noreferrer" target="_blank">http://www.python.org/</a>>`_ >=3.6 Automated test suite\ :sup:`2`<br>
`zlib <<a href="http://zlib.net" rel="noreferrer" target="_blank">http://zlib.net</a>>`_ >=1.2.3.4 Compression library\ :sup:`3`<br>
<br>
diff --git a/llvm/docs/ReleaseNotes.rst b/llvm/docs/ReleaseNotes.rst<br>
index 2be1febb44a7a..963fa07a3412c 100644<br>
--- a/llvm/docs/ReleaseNotes.rst<br>
+++ b/llvm/docs/ReleaseNotes.rst<br>
@@ -47,6 +47,11 @@ Non-comprehensive list of changes in this release<br>
Update on required toolchains to build LLVM<br>
-------------------------------------------<br>
<br>
+With LLVM 17.x we raised the version requirement of CMake used to build LLVM.<br>
+The new requirements are as follows:<br>
+<br>
+* CMake >= 3.20.0<br>
+<br>
Changes to the LLVM IR<br>
----------------------<br>
<br>
<br>
diff --git a/mlir/CMakeLists.txt b/mlir/CMakeLists.txt<br>
index c9b0d53bc3e94..d91d1b105da46 100644<br>
--- a/mlir/CMakeLists.txt<br>
+++ b/mlir/CMakeLists.txt<br>
@@ -1,5 +1,5 @@<br>
# MLIR project.<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
@@ -11,13 +11,6 @@ include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake<br>
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)<br>
project(mlir)<br>
set(MLIR_STANDALONE_BUILD TRUE)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
endif()<br>
<br>
# Must go below project(..)<br>
<br>
diff --git a/mlir/examples/standalone/CMakeLists.txt b/mlir/examples/standalone/CMakeLists.txt<br>
index 65461c048b3f2..038242ba1437a 100644<br>
--- a/mlir/examples/standalone/CMakeLists.txt<br>
+++ b/mlir/examples/standalone/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
project(standalone-dialect LANGUAGES CXX C)<br>
<br>
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)<br>
<br>
diff --git a/openmp/CMakeLists.txt b/openmp/CMakeLists.txt<br>
index a87ea2fb57c51..50246b663289a 100644<br>
--- a/openmp/CMakeLists.txt<br>
+++ b/openmp/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)<br>
<br>
@@ -12,13 +12,6 @@ list(INSERT CMAKE_MODULE_PATH 0<br>
if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")<br>
set(OPENMP_STANDALONE_BUILD TRUE)<br>
project(openmp C CXX)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
endif()<br>
<br>
# Must go below project(..)<br>
<br>
diff --git a/openmp/cmake/DetectTestCompiler/CMakeLists.txt b/openmp/cmake/DetectTestCompiler/CMakeLists.txt<br>
index bc2aa52fbc1cf..8ea7ab8d45ba1 100644<br>
--- a/openmp/cmake/DetectTestCompiler/CMakeLists.txt<br>
+++ b/openmp/cmake/DetectTestCompiler/CMakeLists.txt<br>
@@ -1,4 +1,4 @@<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
project(DetectTestCompiler C CXX)<br>
<br>
include(CheckCCompilerFlag)<br>
<br>
diff --git a/openmp/docs/SupportAndFAQ.rst b/openmp/docs/SupportAndFAQ.rst<br>
index 249eb18b82a26..c50433bb5b6ed 100644<br>
--- a/openmp/docs/SupportAndFAQ.rst<br>
+++ b/openmp/docs/SupportAndFAQ.rst<br>
@@ -307,7 +307,7 @@ require a few additions.<br>
<br>
.. code-block:: cmake<br>
<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
project(offloadTest VERSION 1.0 LANGUAGES CXX)<br>
<br>
list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp")<br>
@@ -318,7 +318,7 @@ require a few additions.<br>
target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX)<br>
target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp)<br>
<br>
-Using this module requires at least CMake version 3.13.4. Supported languages<br>
+Using this module requires at least CMake version 3.20.0. Supported languages<br>
are C and C++ with Fortran support planned in the future. Compiler support is<br>
best for Clang but this module should work for other compiler vendors such as<br>
IBM, GNU.<br>
<br>
diff --git a/openmp/libompd/src/CMakeLists.txt b/openmp/libompd/src/CMakeLists.txt<br>
index f361fcf35a273..0402a01772010 100644<br>
--- a/openmp/libompd/src/CMakeLists.txt<br>
+++ b/openmp/libompd/src/CMakeLists.txt<br>
@@ -9,7 +9,7 @@<br>
#<br>
<br>
project (libompd)<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
add_library (ompd SHARED TargetValue.cpp omp-debug.cpp omp-state.cpp omp-icv.cpp)<br>
<br>
<br>
diff --git a/openmp/libomptarget/plugins/remote/src/CMakeLists.txt b/openmp/libomptarget/plugins/remote/src/CMakeLists.txt<br>
index 6299fb38ee8b4..8a16963c913a1 100644<br>
--- a/openmp/libomptarget/plugins/remote/src/CMakeLists.txt<br>
+++ b/openmp/libomptarget/plugins/remote/src/CMakeLists.txt<br>
@@ -10,7 +10,7 @@<br>
#<br>
##===----------------------------------------------------------------------===##<br>
<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
# Define the suffix for the runtime messaging dumps.<br>
add_definitions(-DTARGET_NAME=RPC)<br>
<br>
diff --git a/openmp/tools/Modules/FindOpenMPTarget.cmake b/openmp/tools/Modules/FindOpenMPTarget.cmake<br>
index 3591a49f685b1..424294090d5d0 100644<br>
--- a/openmp/tools/Modules/FindOpenMPTarget.cmake<br>
+++ b/openmp/tools/Modules/FindOpenMPTarget.cmake<br>
@@ -79,7 +79,7 @@ be used to override the standard flag searching for a given compiler.<br>
# TODO: Test more compilers<br>
<br>
cmake_policy(PUSH)<br>
-cmake_policy(VERSION 3.13.4)<br>
+cmake_policy(VERSION 3.20.0)<br>
<br>
find_package(OpenMP ${OpenMPTarget_FIND_VERSION} REQUIRED)<br>
<br>
<br>
diff --git a/openmp/tools/Modules/README.rst b/openmp/tools/Modules/README.rst<br>
index f19619e389b37..b8cc5f08b390b 100644<br>
--- a/openmp/tools/Modules/README.rst<br>
+++ b/openmp/tools/Modules/README.rst<br>
@@ -26,7 +26,7 @@ require a few additions.<br>
<br>
.. code-block:: cmake<br>
<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
project(offloadTest VERSION 1.0 LANGUAGES CXX)<br>
<br>
list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp")<br>
@@ -37,7 +37,7 @@ require a few additions.<br>
target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX)<br>
target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp)<br>
<br>
-Using this module requires at least CMake version 3.13.4. Supported languages<br>
+Using this module requires at least CMake version 3.20.0. Supported languages<br>
are C and C++ with Fortran support planned in the future. If your application<br>
requires building for a specific device architecture you can set the<br>
``OpenMPTarget_<device>_ARCH=<flag>`` variable. Compiler support is best for<br>
<br>
diff --git a/polly/CMakeLists.txt b/polly/CMakeLists.txt<br>
index 536f11f968292..5d0f2cd7f00ec 100644<br>
--- a/polly/CMakeLists.txt<br>
+++ b/polly/CMakeLists.txt<br>
@@ -1,14 +1,7 @@<br>
# Check if this is a in tree build.<br>
if (NOT DEFINED LLVM_MAIN_SRC_DIR)<br>
project(Polly)<br>
- cmake_minimum_required(VERSION 3.13.4)<br>
- if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
- endif()<br>
+ cmake_minimum_required(VERSION 3.20.0)<br>
set(POLLY_STANDALONE_BUILD TRUE)<br>
endif()<br>
<br>
<br>
diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt<br>
index 2461522349ee0..255e22af9a26b 100644<br>
--- a/pstl/CMakeLists.txt<br>
+++ b/pstl/CMakeLists.txt<br>
@@ -5,7 +5,7 @@<br>
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception<br>
#<br>
#===----------------------------------------------------------------------===##<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
<br>
set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h")<br>
file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$")<br>
<br>
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt<br>
index 37cab6e17ee05..be68d6df34c21 100644<br>
--- a/runtimes/CMakeLists.txt<br>
+++ b/runtimes/CMakeLists.txt<br>
@@ -1,12 +1,5 @@<br>
# This file handles building LLVM runtime sub-projects.<br>
-cmake_minimum_required(VERSION 3.13.4)<br>
-if ("${CMAKE_VERSION}" VERSION_LESS "3.20.0")<br>
- message(WARNING<br>
- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 17.0.0, the "<br>
- "minimum version of CMake required to build LLVM will become 3.20.0, and "<br>
- "using an older CMake will become an error. Please upgrade your CMake to "<br>
- "at least 3.20.0 now to avoid issues in the future!")<br>
-endif()<br>
+cmake_minimum_required(VERSION 3.20.0)<br>
project(Runtimes C CXX ASM)<br>
<br>
# Add path for custom and the LLVM build's modules to the CMake module path.<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>