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 /cmake | |
| 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 'cmake')
| -rw-r--r-- | cmake/Modules/CMakePolicy.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cmake/Modules/CMakePolicy.cmake b/cmake/Modules/CMakePolicy.cmake index 0ec32ad..8a3445c 100644 --- a/cmake/Modules/CMakePolicy.cmake +++ b/cmake/Modules/CMakePolicy.cmake @@ -1,5 +1,10 @@ # CMake policy settings shared between LLVM projects +# CMP0091: MSVC runtime library flags are selected by an abstraction. +# New in CMake 3.15. https://cmake.org/cmake/help/latest/policy/CMP0091.html +if(POLICY CMP0091) + cmake_policy(SET CMP0091 OLD) +endif() # CMP0114: ExternalProject step targets fully adopt their steps. # New in CMake 3.19: https://cmake.org/cmake/help/latest/policy/CMP0114.html if(POLICY CMP0114) |