diff options
| author | Mark de Wever <koraq@xs4all.nl> | 2023-05-24 18:12:32 +0200 |
|---|---|---|
| committer | Mark de Wever <koraq@xs4all.nl> | 2023-05-27 12:51:21 +0200 |
| commit | cbaa3597aaf6273e66b3f445ed36a6458143fe6a (patch) | |
| tree | 0960cf77e2b0feda19ba83a49615547135041a6d /runtimes/CMakeLists.txt | |
| parent | a218c991811c2bc29539b6946920342f956fe758 (diff) | |
| download | llvm-cbaa3597aaf6273e66b3f445ed36a6458143fe6a.zip llvm-cbaa3597aaf6273e66b3f445ed36a6458143fe6a.tar.gz llvm-cbaa3597aaf6273e66b3f445ed36a6458143fe6a.tar.bz2 | |
Reland "[CMake] Bumps minimum version to 3.20.0.
This reverts commit d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6.
Adds the patch by @hans from
https://github.com/llvm/llvm-project/issues/62719
This patch fixes the Windows build.
d763c6e5e2d0a6b34097aa7dabca31e9aff9b0b6 reverted the reviews
D144509 [CMake] Bumps minimum version to 3.20.0.
This partly undoes D137724.
This change has been discussed on discourse
https://discourse.llvm.org/t/rfc-upgrading-llvms-minimum-required-cmake-version/66193
Note this does not remove work-arounds for older CMake versions, that
will be done in followup patches.
D150532 [OpenMP] Compile assembly files as ASM, not C
Since CMake 3.20, CMake explicitly passes "-x c" (or equivalent)
when compiling a file which has been set as having the language
C. This behaviour change only takes place if "cmake_minimum_required"
is set to 3.20 or newer, or if the policy CMP0119 is set to new.
Attempting to compile assembly files with "-x c" fails, however
this is workarounded in many cases, as OpenMP overrides this with
"-x assembler-with-cpp", however this is only added for non-Windows
targets.
Thus, after increasing cmake_minimum_required to 3.20, this breaks
compiling the GNU assembly for Windows targets; the GNU assembly is
used for ARM and AArch64 Windows targets when building with Clang.
This patch unbreaks that.
D150688 [cmake] Set CMP0091 to fix Windows builds after the cmake_minimum_required bump
The build uses other mechanism to select the runtime.
Fixes #62719
Reviewed By: #libc, Mordante
Differential Revision: https://reviews.llvm.org/D151344
Diffstat (limited to 'runtimes/CMakeLists.txt')
| -rw-r--r-- | runtimes/CMakeLists.txt | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index 37cab6e..5995298 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -1,16 +1,13 @@ # This file handles building LLVM runtime sub-projects. -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(Runtimes C CXX ASM) +cmake_minimum_required(VERSION 3.20.0) # Add path for custom and the LLVM build's modules to the CMake module path. set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") +include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake + NO_POLICY_SCOPE) + +project(Runtimes C CXX ASM) + list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" |