[all-commits] [llvm/llvm-project] cbaa35: Reland "[CMake] Bumps minimum version to 3.20.0.

Mark de Wever via All-commits all-commits at lists.llvm.org
Sat May 27 03:51:38 PDT 2023


  Branch: refs/heads/main
  Home:   https://github.com/llvm/llvm-project
  Commit: cbaa3597aaf6273e66b3f445ed36a6458143fe6a
      https://github.com/llvm/llvm-project/commit/cbaa3597aaf6273e66b3f445ed36a6458143fe6a
  Author: Mark de Wever <koraq at xs4all.nl>
  Date:   2023-05-27 (Sat, 27 May 2023)

  Changed paths:
    M bolt/runtime/CMakeLists.txt
    M clang/CMakeLists.txt
    M clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt
    M cmake/Modules/CMakePolicy.cmake
    M compiler-rt/CMakeLists.txt
    M compiler-rt/lib/builtins/CMakeLists.txt
    M compiler-rt/lib/crt/CMakeLists.txt
    M flang/CMakeLists.txt
    M flang/lib/Decimal/CMakeLists.txt
    M flang/runtime/CMakeLists.txt
    M libc/CMakeLists.txt
    M libc/examples/hello_world/CMakeLists.txt
    M libclc/CMakeLists.txt
    M libcxx/CMakeLists.txt
    M libcxxabi/CMakeLists.txt
    M libunwind/CMakeLists.txt
    M libunwind/src/CMakeLists.txt
    M lld/CMakeLists.txt
    M lldb/CMakeLists.txt
    M lldb/tools/debugserver/CMakeLists.txt
    M llvm-libgcc/CMakeLists.txt
    M llvm/CMakeLists.txt
    M llvm/docs/CMake.rst
    M llvm/docs/GettingStarted.rst
    M llvm/docs/ReleaseNotes.rst
    M mlir/CMakeLists.txt
    M mlir/examples/standalone/CMakeLists.txt
    M openmp/CMakeLists.txt
    M openmp/cmake/DetectTestCompiler/CMakeLists.txt
    M openmp/docs/SupportAndFAQ.rst
    M openmp/libompd/src/CMakeLists.txt
    M openmp/libomptarget/plugins/remote/src/CMakeLists.txt
    M openmp/runtime/src/CMakeLists.txt
    M openmp/tools/Modules/FindOpenMPTarget.cmake
    M openmp/tools/Modules/README.rst
    M polly/CMakeLists.txt
    M pstl/CMakeLists.txt
    M runtimes/CMakeLists.txt

  Log Message:
  -----------
  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




More information about the All-commits mailing list