This is an archive of the discontinued LLVM Phabricator instance.

Differential D151344

Reland "[CMake] Bumps minimum version to 3.20.0.
ClosedPublic

Authored by Mordante on May 24 2023, 9:17 AM.

Details

Reviewers
glandium
hans
thakis
bollu
ldionne
rafauler
Amir
maksfb
NoQ
jdoerfert
Mordante
Group Reviewers
Restricted Project
Restricted Project
Restricted Project
Commits
rGcbaa3597aaf6: Reland "[CMake] Bumps minimum version to 3.20.0.
Summary

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

Diff Detail

Event Timeline

Mordante created this revision.May 24 2023, 9:17 AM
Herald added a reviewer: bollu. · View Herald TranscriptMay 24 2023, 9:17 AM
Herald added a reviewer: ldionne. · View Herald Transcript
Herald added a reviewer: rafauler. · View Herald Transcript
Herald added a reviewer: Amir. · View Herald Transcript
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added a reviewer: NoQ. · View Herald Transcript
Herald added projects: Restricted Project, Restricted Project, Restricted Project. · View Herald Transcript
Herald added subscribers: libc-commits, bviyer, ekilmer and 28 others. · View Herald Transcript
Mordante requested review of this revision.May 24 2023, 9:17 AM
Herald added a reviewer: jdoerfert. · View Herald TranscriptMay 24 2023, 9:17 AM
Herald added projects: Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, libcxx-commits, openmp-commits and 9 others. · View Herald Transcript
Mordante mentioned this in D144509: [CMake] Bumps minimum version to 3.20.0..May 24 2023, 9:19 AM
MaskRay added a subscriber: MaskRay.May 24 2023, 9:56 AM

Thank you for making another try for the treewide change (which is admittedly very painful and not many people do such work).
Can you include the original patch description to the summary? That is the main part and the message "This reverts commit " is secondary. Readers should not need to trace through the revert history to obtain the original motivation.

Herald added a subscriber: JDevlieghere. · View Herald TranscriptMay 24 2023, 9:56 AM
andrewng added a subscriber: andrewng.May 24 2023, 10:17 AM
glandium added a comment.May 24 2023, 1:17 PM

I haven't tested this patch, but it looks like it contains everything that unbreaks our builds.

Harbormaster completed remote builds in B234227: Diff 525212.May 24 2023, 6:07 PM
hans added a comment.May 25 2023, 2:28 AM

This looks right to me. (I'm out of office at the moment, but this looks like what I tested in https://github.com/llvm/llvm-project/issues/62719 so it should work.)

h-vetinari added a subscriber: h-vetinari.May 25 2023, 5:09 PM
h-vetinari added inline comments.
libunwind/src/CMakeLists.txt
28–35

Shouldn't it be possible to remove that entire block (as it only fires for CMake <3.20)?

mstorsjo added inline comments.May 25 2023, 9:09 PM
libunwind/src/CMakeLists.txt
28–35

The intention was to do such cleanups in a later patch, as mentioned in the original commit message in https://reviews.llvm.org/D144509. (I guess it would be good to bring the original commit message along with the reland attempts too.)

h-vetinari added inline comments.May 25 2023, 10:04 PM
libunwind/src/CMakeLists.txt
28–35

Well sure, but "workarounds" is a broad term. It makes sense to not try to clean up everything that newer CMake enables, but this PR does remove a lot of (all?) other lines with CMAKE_VERSION VERSION_LESS <x> where x<3.20. On top of that, since this line is already being changed (which is why I noticed in the first place), I'd suggest to just remove it. But I don't feel strongly about this, just thought I'd point it out.

Mordante edited the summary of this revision. (Show Details)May 27 2023, 3:45 AM
Mordante added a reverted change: D137724: [CMake] Warn when the version is older than 3.20.0..
Herald added a subscriber: kristof.beyls. · View Herald TranscriptMay 27 2023, 3:45 AM
Mordante accepted this revision.May 27 2023, 3:50 AM
Mordante marked 3 inline comments as done.
In D151344#4368926, @MaskRay wrote:

Thank you for making another try for the treewide change (which is admittedly very painful and not many people do such work).

Thanks. And it indeed takes quite a lot of effort.

Can you include the original patch description to the summary? That is the main part and the message "This reverts commit " is secondary. Readers should not need to trace through the revert history to obtain the original motivation.

Good suggestion I've updated the message.

Since @glandium and @hans seem happy with the changes I'll land this patch.

libunwind/src/CMakeLists.txt
28–35

Yes the intention is to do these cleanups later. The patch does more than I'd like already. However that is due to the original patch and followups being reverted.

This revision was not accepted when it landed; it landed in state Needs Review.May 27 2023, 3:51 AM
Closed by commit rGcbaa3597aaf6: Reland "[CMake] Bumps minimum version to 3.20.0. (authored by Mordante). · Explain Why
This revision was automatically updated to reflect the committed changes.
Mordante marked an inline comment as done.
Mordante added a commit: rGcbaa3597aaf6: Reland "[CMake] Bumps minimum version to 3.20.0..
h-vetinari mentioned this in D152103: [LLVM] Removes CMake work-arounds..Jun 4 2023, 11:32 PM

Revision Contents

PathSize
bolt/
runtime/
2 lines
clang/
9 lines
tools/
scan-build-py/
tests/
functional/
exec/
2 lines
cmake/
Modules/
5 lines
compiler-rt/
15 lines
lib/
builtins/
9 lines
crt/
9 lines
flang/
9 lines
lib/
Decimal/
2 lines
runtime/
9 lines
libc/
2 lines
examples/
hello_world/
2 lines
libclc/
2 lines
libcxx/
2 lines
libcxxabi/
2 lines
libunwind/
2 lines
src/
3 lines
lld/
9 lines
lldb/
9 lines
tools/
debugserver/
9 lines
llvm-libgcc/
2 lines
llvm/
9 lines
docs/
4 lines
2 lines
5 lines
mlir/
9 lines
examples/
standalone/
2 lines
openmp/
11 lines
cmake/
DetectTestCompiler/
2 lines
docs/
4 lines
libompd/
src/
2 lines
libomptarget/
plugins/
remote/
src/
2 lines
runtime/
src/
2 lines
tools/
Modules/
2 lines
4 lines
polly/
9 lines
pstl/
2 lines
runtimes/
15 lines

Diff 526252

bolt/runtime/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
include(CheckIncludeFiles) include(CheckIncludeFiles)
include(GNUInstallDirs) include(GNUInstallDirs)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
project(libbolt_rt_project) project(libbolt_rt_project)
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

clang/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
# If we are not building as a part of LLVM, build Clang as an # If we are not building as a part of LLVM, build Clang as an
# standalone project, using LLVM as an external library: # standalone project, using LLVM as an external library:
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(Clang) project(Clang)
set(CLANG_BUILT_STANDALONE TRUE) set(CLANG_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()
endif() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
if(CLANG_BUILT_STANDALONE) if(CLANG_BUILT_STANDALONE)
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
▲ Show 20 Lines • Show All 881 Lines • Show Last 20 Lines

clang/tools/scan-build-py/tests/functional/exec/CMakeLists.txt

project(exec C) project(exec C)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
check_c_compiler_flag("-std=c99" C99_SUPPORTED) check_c_compiler_flag("-std=c99" C99_SUPPORTED)
if (C99_SUPPORTED) if (C99_SUPPORTED)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
endif() endif()
include(CheckFunctionExists) include(CheckFunctionExists)
Show All 21 Lines

cmake/Modules/CMakePolicy.cmake

# CMake policy settings shared between LLVM projects # 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. # CMP0114: ExternalProject step targets fully adopt their steps.
# New in CMake 3.19: https://cmake.org/cmake/help/latest/policy/CMP0114.html # New in CMake 3.19: https://cmake.org/cmake/help/latest/policy/CMP0114.html
if(POLICY CMP0114) if(POLICY CMP0114)
cmake_policy(SET CMP0114 OLD) cmake_policy(SET CMP0114 OLD)
endif() endif()
# CMP0116: Ninja generators transform `DEPFILE`s from `add_custom_command()` # CMP0116: Ninja generators transform `DEPFILE`s from `add_custom_command()`
# New in CMake 3.20. https://cmake.org/cmake/help/latest/policy/CMP0116.html # New in CMake 3.20. https://cmake.org/cmake/help/latest/policy/CMP0116.html
if(POLICY CMP0116) if(POLICY CMP0116)
cmake_policy(SET CMP0116 OLD) cmake_policy(SET CMP0116 OLD)
endif() endif()

compiler-rt/CMakeLists.txt

# CMake build for CompilerRT. # CMake build for CompilerRT.
# #
# An important constraint of the build is that it only produces libraries # An important constraint of the build is that it only produces libraries
# based on the ability of the host toolchain to target various platforms. # based on the ability of the host toolchain to target various platforms.
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
# Check if compiler-rt is built as a standalone project. # Check if compiler-rt is built as a standalone project.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
project(CompilerRT C CXX ASM) project(CompilerRT C CXX ASM)
set(COMPILER_RT_STANDALONE_BUILD TRUE) set(COMPILER_RT_STANDALONE_BUILD TRUE)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
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() endif()
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom compiler-rt modules. # Add path for custom compiler-rt modules.
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${LLVM_COMMON_CMAKE_UTILS}" "${LLVM_COMMON_CMAKE_UTILS}"
"${LLVM_COMMON_CMAKE_UTILS}/Modules" "${LLVM_COMMON_CMAKE_UTILS}/Modules"
) )
▲ Show 20 Lines • Show All 755 Lines • Show Last 20 Lines

compiler-rt/lib/builtins/CMakeLists.txt

# This directory contains a large amount of C code which provides # This directory contains a large amount of C code which provides
# generic implementations of the core runtime library along with optimized # generic implementations of the core runtime library along with optimized
# architecture-specific code in various subdirectories. # architecture-specific code in various subdirectories.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
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_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
project(CompilerRTBuiltins C ASM) project(CompilerRTBuiltins C ASM)
set(COMPILER_RT_STANDALONE_BUILD TRUE) set(COMPILER_RT_STANDALONE_BUILD TRUE)
set(COMPILER_RT_BUILTINS_STANDALONE_BUILD TRUE) set(COMPILER_RT_BUILTINS_STANDALONE_BUILD TRUE)
set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
▲ Show 20 Lines • Show All 886 Lines • Show Last 20 Lines

compiler-rt/lib/crt/CMakeLists.txt

if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
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_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
project(CompilerRTCRT C) project(CompilerRTCRT C)
set(COMPILER_RT_STANDALONE_BUILD TRUE) set(COMPILER_RT_STANDALONE_BUILD TRUE)
set(COMPILER_RT_CRT_STANDALONE_BUILD TRUE) set(COMPILER_RT_CRT_STANDALONE_BUILD TRUE)
set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") set(COMPILER_RT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
▲ Show 20 Lines • Show All 53 Lines • Show Last 20 Lines

flang/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
Show All 24 Lines
option(FLANG_ENABLE_WERROR "Fail and stop building flang if a warning is triggered." OFF) option(FLANG_ENABLE_WERROR "Fail and stop building flang if a warning is triggered." OFF)
# Check for a standalone build and configure as appropriate from # Check for a standalone build and configure as appropriate from
# there. # there.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
message("Building Flang as a standalone project.") message("Building Flang as a standalone project.")
project(Flang) project(Flang)
set(FLANG_STANDALONE_BUILD ON) set(FLANG_STANDALONE_BUILD ON)
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()
else() else()
set(FLANG_STANDALONE_BUILD OFF) set(FLANG_STANDALONE_BUILD OFF)
endif() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
# MSVC + clang-cl build requires clang_rt.builtin.${target} library # MSVC + clang-cl build requires clang_rt.builtin.${target} library
▲ Show 20 Lines • Show All 442 Lines • Show Last 20 Lines

flang/lib/Decimal/CMakeLists.txt

if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(FortranDecimal C CXX) project(FortranDecimal C CXX)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..") set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
▲ Show 20 Lines • Show All 45 Lines • Show Last 20 Lines

flang/runtime/CMakeLists.txt

#===-- runtime/CMakeLists.txt ----------------------------------------------===# #===-- runtime/CMakeLists.txt ----------------------------------------------===#
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
#===------------------------------------------------------------------------===# #===------------------------------------------------------------------------===#
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
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(FlangRuntime C CXX) project(FlangRuntime C CXX)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED TRUE) set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)
set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..") set(FLANG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/..")
▲ Show 20 Lines • Show All 137 Lines • Show Last 20 Lines

libc/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
# Include LLVM's cmake policies. # Include LLVM's cmake policies.
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
▲ Show 20 Lines • Show All 223 Lines • Show Last 20 Lines

libc/examples/hello_world/CMakeLists.txt

project(hello_world) project(hello_world)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
include(../examples.cmake) include(../examples.cmake)
add_example( add_example(
hello_world hello_world
hello_world.c hello_world.c
) )

libclc/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project( libclc VERSION 0.2.0 LANGUAGES CXX C) project( libclc VERSION 0.2.0 LANGUAGES CXX C)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
include( GNUInstallDirs ) include( GNUInstallDirs )
set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
amdgcn-amdhsa/lib/SOURCES; amdgcn-amdhsa/lib/SOURCES;
▲ Show 20 Lines • Show All 349 Lines • Show Last 20 Lines

libcxx/CMakeLists.txt

# See https://libcxx.llvm.org/docs/BuildingLibcxx.html for instructions on how # See https://libcxx.llvm.org/docs/BuildingLibcxx.html for instructions on how
# to build libcxx with CMake. # to build libcxx with CMake.
#=============================================================================== #===============================================================================
# Setup Project # Setup Project
#=============================================================================== #===============================================================================
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom modules # Add path for custom modules
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../runtimes/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/../runtimes/cmake/Modules"
▲ Show 20 Lines • Show All 875 Lines • Show Last 20 Lines

libcxxabi/CMakeLists.txt

# See www/CMake.html for instructions on how to build libcxxabi with CMake. # See www/CMake.html for instructions on how to build libcxxabi with CMake.
#=============================================================================== #===============================================================================
# Setup Project # Setup Project
#=============================================================================== #===============================================================================
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom modules # Add path for custom modules
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../runtimes/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/../runtimes/cmake/Modules"
▲ Show 20 Lines • Show All 461 Lines • Show Last 20 Lines

libunwind/CMakeLists.txt

#=============================================================================== #===============================================================================
# Setup Project # Setup Project
#=============================================================================== #===============================================================================
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
# Add path for custom modules # Add path for custom modules
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../runtimes/cmake/Modules" "${CMAKE_CURRENT_SOURCE_DIR}/../runtimes/cmake/Modules"
▲ Show 20 Lines • Show All 290 Lines • Show Last 20 Lines

libunwind/src/CMakeLists.txt

Show All 19 Lines
set_source_files_properties(${LIBUNWIND_C_SOURCES} set_source_files_properties(${LIBUNWIND_C_SOURCES}
PROPERTIES PROPERTIES
COMPILE_FLAGS "-std=c99") COMPILE_FLAGS "-std=c99")
set(LIBUNWIND_ASM_SOURCES set(LIBUNWIND_ASM_SOURCES
UnwindRegistersRestore.S UnwindRegistersRestore.S
UnwindRegistersSave.S UnwindRegistersSave.S
) )
# See add_asm_sources() in compiler-rt for explanation of this workaround. # See add_asm_sources() in compiler-rt for explanation of this workaround.
# CMake doesn't work correctly with assembly on AIX. Workaround by compiling # CMake doesn't work correctly with assembly on AIX. Workaround by compiling
# as C files as well. # as C files as well.
if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR if((APPLE AND CMAKE_VERSION VERSION_LESS 3.19) OR
(MINGW AND CMAKE_VERSION VERSION_LESS 3.17) OR (MINGW AND CMAKE_VERSION VERSION_LESS 3.17))
(${CMAKE_SYSTEM_NAME} MATCHES "AIX"))
set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C) set_source_files_properties(${LIBUNWIND_ASM_SOURCES} PROPERTIES LANGUAGE C)
endif() endif()
h-vetinariUnsubmitted
Done
ReplyInline Actions

Shouldn't it be possible to remove that entire block (as it only fires for CMake <3.20)?

h-vetinari: Shouldn't it be possible to remove that entire block (as it only fires for CMake <3.20)?
mstorsjoUnsubmitted
Done
ReplyInline Actions

The intention was to do such cleanups in a later patch, as mentioned in the original commit message in https://reviews.llvm.org/D144509. (I guess it would be good to bring the original commit message along with the reland attempts too.)

mstorsjo: The intention was to do such cleanups in a later patch, as mentioned in the original commit…
h-vetinariUnsubmitted
Done
ReplyInline Actions

Well sure, but "workarounds" is a broad term. It makes sense to not try to clean up everything that newer CMake enables, but this PR does remove a lot of (all?) other lines with CMAKE_VERSION VERSION_LESS <x> where x<3.20. On top of that, since this line is already being changed (which is why I noticed in the first place), I'd suggest to just remove it. But I don't feel strongly about this, just thought I'd point it out.

h-vetinari: Well sure, but "workarounds" is a broad term. It makes sense to not try to clean up everything…
MordanteAuthorUnsubmitted
Done
ReplyInline Actions

Yes the intention is to do these cleanups later. The patch does more than I'd like already. However that is due to the original patch and followups being reverted.

Mordante: Yes the intention is to do these cleanups later. The patch does more than I'd like already.
set(LIBUNWIND_HEADERS set(LIBUNWIND_HEADERS
AddressSpace.hpp AddressSpace.hpp
assembly.h assembly.h
CompactUnwinder.hpp CompactUnwinder.hpp
cet_unwind.h cet_unwind.h
config.h config.h
dwarf2.h dwarf2.h
▲ Show 20 Lines • Show All 194 Lines • Show Last 20 Lines

lld/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
# If we are not building as a part of LLVM, build LLD as an # If we are not building as a part of LLVM, build LLD as an
# standalone project, using LLVM as an external library: # standalone project, using LLVM as an external library:
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(lld) project(lld)
set(LLD_BUILT_STANDALONE TRUE) set(LLD_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()
endif() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
if(LLD_BUILT_STANDALONE) if(LLD_BUILT_STANDALONE)
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
▲ Show 20 Lines • Show All 187 Lines • Show Last 20 Lines

lldb/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
# Add path for custom modules. # Add path for custom modules.
set(CMAKE_MODULE_PATH set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
) )
# If we are not building as part of LLVM, build LLDB as a standalone project, # If we are not building as part of LLVM, build LLDB as a standalone project,
# using LLVM as an external library. # using LLVM as an external library.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(lldb) project(lldb)
set(LLDB_BUILT_STANDALONE TRUE) set(LLDB_BUILT_STANDALONE TRUE)
set(LLVM_INCLUDE_TESTS ON CACHE INTERNAL "") 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() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS}) option(LLDB_INCLUDE_TESTS "Generate build targets for the LLDB unit tests." ${LLVM_INCLUDE_TESTS})
if(LLDB_BUILT_STANDALONE) if(LLDB_BUILT_STANDALONE)
▲ Show 20 Lines • Show All 122 Lines • Show Last 20 Lines

lldb/tools/debugserver/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(Debugserver LANGUAGES C CXX ASM-ATT) project(Debugserver LANGUAGES C CXX ASM-ATT)
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
set(LLDB_BUILT_STANDALONE TRUE) 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 set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
"${CMAKE_SOURCE_DIR}/../../cmake" "${CMAKE_SOURCE_DIR}/../../cmake"
"${CMAKE_SOURCE_DIR}/../../cmake/modules" "${CMAKE_SOURCE_DIR}/../../cmake/modules"
) )
include(LLDBStandalone) include(LLDBStandalone)
Show All 13 Lines

llvm-libgcc/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libunwind") if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libunwind")
message(FATAL_ERROR "llvm-libgcc requires being built in a monorepo layout with libunwind available") message(FATAL_ERROR "llvm-libgcc requires being built in a monorepo layout with libunwind available")
endif() endif()
set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake") set(LLVM_COMMON_CMAKE_UTILS "${CMAKE_CURRENT_SOURCE_DIR}/../cmake")
list(APPEND CMAKE_MODULE_PATH list(APPEND CMAKE_MODULE_PATH
Show All 33 Lines

llvm/CMakeLists.txt

# See docs/CMake.html for instructions about how to build LLVM with CMake. # See docs/CMake.html for instructions about how to build LLVM with CMake.
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
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(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
if(NOT DEFINED LLVM_VERSION_MAJOR) if(NOT DEFINED LLVM_VERSION_MAJOR)
▲ Show 20 Lines • Show All 1,332 Lines • Show Last 20 Lines

llvm/docs/CMake.rst

Show All 28 Lines
.. _Quick start: .. _Quick start:
Quick start Quick start
=========== ===========
We use here the command-line, non-interactive CMake interface. We use here the command-line, non-interactive CMake interface.
#. `Download <http://www.cmake.org/cmake/resources/software.html>`_ and install #. `Download <http://www.cmake.org/cmake/resources/software.html>`_ and install
CMake. Version 3.13.4 is the minimum required. CMake. Version 3.20.0 is the minimum required.
#. Open a shell. Your development tools must be reachable from this shell #. Open a shell. Your development tools must be reachable from this shell
through the PATH environment variable. through the PATH environment variable.
#. Create a build directory. Building LLVM in the source #. Create a build directory. Building LLVM in the source
directory is not supported. cd to this directory: directory is not supported. cd to this directory:
.. code-block:: console .. code-block:: console
▲ Show 20 Lines • Show All 860 Lines • ▼ Show 20 Lines
CMake to develop their own LLVM-based projects against an installed version of CMake to develop their own LLVM-based projects against an installed version of
LLVM regardless of how it was built. LLVM regardless of how it was built.
Here is a simple example of a CMakeLists.txt file that imports the LLVM libraries Here is a simple example of a CMakeLists.txt file that imports the LLVM libraries
and uses them to build a simple application ``simple-tool``. and uses them to build a simple application ``simple-tool``.
.. code-block:: cmake .. code-block:: cmake
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(SimpleProject) project(SimpleProject)
find_package(LLVM REQUIRED CONFIG) find_package(LLVM REQUIRED CONFIG)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}") message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
# Set your project compile flags. # Set your project compile flags.
▲ Show 20 Lines • Show All 176 Lines • Show Last 20 Lines

llvm/docs/GettingStarted.rst

Show First 20 Lines • Show All 274 Lines • ▼ Show 20 Lines
table below lists those required packages. The Package column is the usual name table below lists those required packages. The Package column is the usual name
for the software package that LLVM depends on. The Version column provides for the software package that LLVM depends on. The Version column provides
"known to work" versions of the package. The Notes column describes how LLVM "known to work" versions of the package. The Notes column describes how LLVM
uses the package and provides other details. uses the package and provides other details.
=========================================================== ============ ========================================== =========================================================== ============ ==========================================
Package Version Notes Package Version Notes
=========================================================== ============ ========================================== =========================================================== ============ ==========================================
`CMake <http://cmake.org/>`__ >=3.13.4 Makefile/workspace generator `CMake <http://cmake.org/>`__ >=3.20.0 Makefile/workspace generator
`GCC <http://gcc.gnu.org/>`_ >=7.1.0 C/C++ compiler\ :sup:`1` `GCC <http://gcc.gnu.org/>`_ >=7.1.0 C/C++ compiler\ :sup:`1`
`python <http://www.python.org/>`_ >=3.6 Automated test suite\ :sup:`2` `python <http://www.python.org/>`_ >=3.6 Automated test suite\ :sup:`2`
`zlib <http://zlib.net>`_ >=1.2.3.4 Compression library\ :sup:`3` `zlib <http://zlib.net>`_ >=1.2.3.4 Compression library\ :sup:`3`
`GNU Make <http://savannah.gnu.org/projects/make>`_ 3.79, 3.79.1 Makefile/build processor\ :sup:`4` `GNU Make <http://savannah.gnu.org/projects/make>`_ 3.79, 3.79.1 Makefile/build processor\ :sup:`4`
=========================================================== ============ ========================================== =========================================================== ============ ==========================================
.. note:: .. note::
▲ Show 20 Lines • Show All 965 Lines • Show Last 20 Lines

llvm/docs/ReleaseNotes.rst

Show First 20 Lines • Show All 41 Lines • ▼ Show 20 Lines.. NOTE
functionality, or simply have a lot to talk about), see the `NOTE` below functionality, or simply have a lot to talk about), see the `NOTE` below
for adding a new subsection. for adding a new subsection.
* ... * ...
Update on required toolchains to build LLVM Update on required toolchains to build LLVM
------------------------------------------- -------------------------------------------
With LLVM 17.x we raised the version requirement of CMake used to build LLVM.
The new requirements are as follows:
* CMake >= 3.20.0
Changes to the LLVM IR Changes to the LLVM IR
---------------------- ----------------------
* Typed pointers are no longer supported. See the `opaque pointers * Typed pointers are no longer supported. See the `opaque pointers
<OpaquePointers.html>`__ documentation for migration instructions. <OpaquePointers.html>`__ documentation for migration instructions.
* The ``nofpclass`` attribute was introduced. This allows more * The ``nofpclass`` attribute was introduced. This allows more
optimizations around special floating point value comparisons. optimizations around special floating point value comparisons.
▲ Show 20 Lines • Show All 267 Lines • Show Last 20 Lines

mlir/CMakeLists.txt

# MLIR project. # MLIR project.
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS) if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif() endif()
include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake include(${LLVM_COMMON_CMAKE_UTILS}/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE) NO_POLICY_SCOPE)
# Check if MLIR is built as a standalone project. # Check if MLIR is built as a standalone project.
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
project(mlir) project(mlir)
set(MLIR_STANDALONE_BUILD TRUE) set(MLIR_STANDALONE_BUILD 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()
endif() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
if(MLIR_STANDALONE_BUILD) if(MLIR_STANDALONE_BUILD)
find_package(LLVM CONFIG REQUIRED) find_package(LLVM CONFIG REQUIRED)
▲ Show 20 Lines • Show All 251 Lines • Show Last 20 Lines

mlir/examples/standalone/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(standalone-dialect LANGUAGES CXX C) project(standalone-dialect LANGUAGES CXX C)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD 17 CACHE STRING "C++ standard to conform to")
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
find_package(MLIR REQUIRED CONFIG) find_package(MLIR REQUIRED CONFIG)
▲ Show 20 Lines • Show All 47 Lines • Show Last 20 Lines

openmp/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake) set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
# Add path for custom modules # Add path for custom modules
list(INSERT CMAKE_MODULE_PATH 0 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${LLVM_COMMON_CMAKE_UTILS}/Modules" "${LLVM_COMMON_CMAKE_UTILS}/Modules"
) )
# llvm/runtimes/ will set OPENMP_STANDALONE_BUILD. # llvm/runtimes/ will set OPENMP_STANDALONE_BUILD.
if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}") if (OPENMP_STANDALONE_BUILD OR "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
set(OPENMP_STANDALONE_BUILD TRUE) set(OPENMP_STANDALONE_BUILD TRUE)
project(openmp C CXX) project(openmp C CXX ASM)
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() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
if (OPENMP_STANDALONE_BUILD) if (OPENMP_STANDALONE_BUILD)
# CMAKE_BUILD_TYPE was not set, default to Release. # CMAKE_BUILD_TYPE was not set, default to Release.
if (NOT CMAKE_BUILD_TYPE) if (NOT CMAKE_BUILD_TYPE)
▲ Show 20 Lines • Show All 113 Lines • Show Last 20 Lines

openmp/cmake/DetectTestCompiler/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(DetectTestCompiler C CXX) project(DetectTestCompiler C CXX)
include(CheckCCompilerFlag) include(CheckCCompilerFlag)
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
include(CheckIncludeFile) include(CheckIncludeFile)
include(CheckIncludeFileCXX) include(CheckIncludeFileCXX)
function(write_compiler_information lang) function(write_compiler_information lang)
Show All 38 Lines

openmp/docs/SupportAndFAQ.rst

Show First 20 Lines • Show All 301 Lines • ▼ Show 20 Lines
To use this module, simply add the path to CMake's current module path and call To use this module, simply add the path to CMake's current module path and call
``find_package``. The module will be installed with your OpenMP installation by ``find_package``. The module will be installed with your OpenMP installation by
default. Including OpenMP offloading support in an application should now only default. Including OpenMP offloading support in an application should now only
require a few additions. require a few additions.
.. code-block:: cmake .. code-block:: cmake
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(offloadTest VERSION 1.0 LANGUAGES CXX) project(offloadTest VERSION 1.0 LANGUAGES CXX)
list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp") list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp")
find_package(OpenMPTarget REQUIRED NVPTX) find_package(OpenMPTarget REQUIRED NVPTX)
add_executable(offload) add_executable(offload)
target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX) target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX)
target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp) target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp)
Using this module requires at least CMake version 3.13.4. Supported languages Using this module requires at least CMake version 3.20.0. Supported languages
are C and C++ with Fortran support planned in the future. Compiler support is are C and C++ with Fortran support planned in the future. Compiler support is
best for Clang but this module should work for other compiler vendors such as best for Clang but this module should work for other compiler vendors such as
IBM, GNU. IBM, GNU.
Q: What does 'Stack size for entry function cannot be statically determined' mean? Q: What does 'Stack size for entry function cannot be statically determined' mean?
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
This is a warning that the Nvidia tools will sometimes emit if the offloading This is a warning that the Nvidia tools will sometimes emit if the offloading
▲ Show 20 Lines • Show All 106 Lines • Show Last 20 Lines

openmp/libompd/src/CMakeLists.txt

# #
#//===----------------------------------------------------------------------===// #//===----------------------------------------------------------------------===//
#// #//
#// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. #// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
#// See https://llvm.org/LICENSE.txt for license information. #// See https://llvm.org/LICENSE.txt for license information.
#// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception #// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
#// #//
#//===----------------------------------------------------------------------===// #//===----------------------------------------------------------------------===//
# #
project (libompd) project (libompd)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
add_library (ompd SHARED TargetValue.cpp omp-debug.cpp omp-state.cpp omp-icv.cpp) add_library (ompd SHARED TargetValue.cpp omp-debug.cpp omp-state.cpp omp-icv.cpp)
target_link_libraries(ompd omp) # ensure generated import library is created first target_link_libraries(ompd omp) # ensure generated import library is created first
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(LIBOMPD_LD_STD_FLAGS FALSE CACHE BOOL set(LIBOMPD_LD_STD_FLAGS FALSE CACHE BOOL
Show All 30 Lines

openmp/libomptarget/plugins/remote/src/CMakeLists.txt

##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
# #
# Build a plugin for remote offloading. # Build a plugin for remote offloading.
# #
##===----------------------------------------------------------------------===## ##===----------------------------------------------------------------------===##
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
# Define the suffix for the runtime messaging dumps. # Define the suffix for the runtime messaging dumps.
add_definitions(-DTARGET_NAME=RPC) add_definitions(-DTARGET_NAME=RPC)
include_directories(${LIBOMPTARGET_SRC_DIR}) include_directories(${LIBOMPTARGET_SRC_DIR})
include_directories(${LIBOMPTARGET_INCLUDE_DIR}) include_directories(${LIBOMPTARGET_INCLUDE_DIR})
include_directories(${GRPC_INCLUDE_DIR}) include_directories(${GRPC_INCLUDE_DIR})
include_directories(${RPC_INCLUDE_DIR}) include_directories(${RPC_INCLUDE_DIR})
Show All 22 Lines

openmp/runtime/src/CMakeLists.txt

Show First 20 Lines • Show All 127 Lines • ▼ Show 20 Lines
libomp_append(LIBOMP_SOURCE_FILES libomp.rc WIN32) libomp_append(LIBOMP_SOURCE_FILES libomp.rc WIN32)
# Get compiler and assembler flags # Get compiler and assembler flags
libomp_get_cxxflags(LIBOMP_CONFIGURED_CXXFLAGS) libomp_get_cxxflags(LIBOMP_CONFIGURED_CXXFLAGS)
libomp_get_asmflags(LIBOMP_CONFIGURED_ASMFLAGS) libomp_get_asmflags(LIBOMP_CONFIGURED_ASMFLAGS)
# Set the compiler flags for each type of source # Set the compiler flags for each type of source
set_source_files_properties(${LIBOMP_CXXFILES} PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_CXXFLAGS}") set_source_files_properties(${LIBOMP_CXXFILES} PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_CXXFLAGS}")
set_source_files_properties(${LIBOMP_ASMFILES} ${LIBOMP_GNUASMFILES} PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_ASMFLAGS}") set_source_files_properties(${LIBOMP_ASMFILES} ${LIBOMP_GNUASMFILES} PROPERTIES COMPILE_FLAGS "${LIBOMP_CONFIGURED_ASMFLAGS}")
# Let the compiler handle the GNU assembly files
set_source_files_properties(${LIBOMP_GNUASMFILES} PROPERTIES LANGUAGE C)
# Remove any cmake-automatic linking of the standard C++ library. # Remove any cmake-automatic linking of the standard C++ library.
# We neither need (nor want) the standard C++ library dependency even though we compile c++ files. # We neither need (nor want) the standard C++ library dependency even though we compile c++ files.
if(NOT ${LIBOMP_USE_STDCPPLIB}) if(NOT ${LIBOMP_USE_STDCPPLIB})
set(LIBOMP_LINKER_LANGUAGE C) set(LIBOMP_LINKER_LANGUAGE C)
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES) set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES)
else() else()
set(LIBOMP_LINKER_LANGUAGE CXX) set(LIBOMP_LINKER_LANGUAGE CXX)
▲ Show 20 Lines • Show All 268 Lines • Show Last 20 Lines

openmp/tools/Modules/FindOpenMPTarget.cmake

Show First 20 Lines • Show All 73 Lines • ▼ Show 20 Lines
# TODO: Support Fortran # TODO: Support Fortran
# TODO: Support multiple offloading targets by setting the "OpenMPTarget" target # TODO: Support multiple offloading targets by setting the "OpenMPTarget" target
# to include flags for all components loaded # to include flags for all components loaded
# TODO: Configure target architecture without a variable (component NVPTX_SM_70) # TODO: Configure target architecture without a variable (component NVPTX_SM_70)
# TODO: Test more compilers # TODO: Test more compilers
cmake_policy(PUSH) cmake_policy(PUSH)
cmake_policy(VERSION 3.13.4) cmake_policy(VERSION 3.20.0)
find_package(OpenMP ${OpenMPTarget_FIND_VERSION} REQUIRED) find_package(OpenMP ${OpenMPTarget_FIND_VERSION} REQUIRED)
# Find the offloading flags for each compiler. # Find the offloading flags for each compiler.
function(_OPENMP_TARGET_DEVICE_FLAG_CANDIDATES LANG DEVICE) function(_OPENMP_TARGET_DEVICE_FLAG_CANDIDATES LANG DEVICE)
if(NOT OpenMPTarget_${LANG}_FLAGS) if(NOT OpenMPTarget_${LANG}_FLAGS)
unset(OpenMPTarget_FLAG_CANDIDATES) unset(OpenMPTarget_FLAG_CANDIDATES)
▲ Show 20 Lines • Show All 248 Lines • Show Last 20 Lines

openmp/tools/Modules/README.rst

Show All 20 Lines
To use this module, simply add the path to CMake's current module path and call To use this module, simply add the path to CMake's current module path and call
``find_package``. The module will be installed with your OpenMP installation by ``find_package``. The module will be installed with your OpenMP installation by
default. Including OpenMP offloading support in an application should now only default. Including OpenMP offloading support in an application should now only
require a few additions. require a few additions.
.. code-block:: cmake .. code-block:: cmake
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
project(offloadTest VERSION 1.0 LANGUAGES CXX) project(offloadTest VERSION 1.0 LANGUAGES CXX)
list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp") list(APPEND CMAKE_MODULE_PATH "${PATH_TO_OPENMP_INSTALL}/lib/cmake/openmp")
find_package(OpenMPTarget REQUIRED NVPTX) find_package(OpenMPTarget REQUIRED NVPTX)
add_executable(offload) add_executable(offload)
target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX) target_link_libraries(offload PRIVATE OpenMPTarget::OpenMPTarget_NVPTX)
target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp) target_sources(offload PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src/Main.cpp)
Using this module requires at least CMake version 3.13.4. Supported languages Using this module requires at least CMake version 3.20.0. Supported languages
are C and C++ with Fortran support planned in the future. If your application are C and C++ with Fortran support planned in the future. If your application
requires building for a specific device architecture you can set the requires building for a specific device architecture you can set the
``OpenMPTarget_<device>_ARCH=<flag>`` variable. Compiler support is best for ``OpenMPTarget_<device>_ARCH=<flag>`` variable. Compiler support is best for
Clang but this module should work for other compiler vendors such as IBM or GNU. Clang but this module should work for other compiler vendors such as IBM or GNU.

polly/CMakeLists.txt

# Check if this is a in tree build. # Check if this is a in tree build.
if (NOT DEFINED LLVM_MAIN_SRC_DIR) if (NOT DEFINED LLVM_MAIN_SRC_DIR)
project(Polly) project(Polly)
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
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(POLLY_STANDALONE_BUILD TRUE) set(POLLY_STANDALONE_BUILD TRUE)
endif() endif()
# Must go below project(..) # Must go below project(..)
include(GNUInstallDirs) include(GNUInstallDirs)
if(POLLY_STANDALONE_BUILD) if(POLLY_STANDALONE_BUILD)
# Where is LLVM installed? # Where is LLVM installed?
▲ Show 20 Lines • Show All 152 Lines • Show Last 20 Lines

pstl/CMakeLists.txt

#===-- CMakeLists.txt ----------------------------------------------------===## #===-- CMakeLists.txt ----------------------------------------------------===##
# #
# Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. # Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
# See https://llvm.org/LICENSE.txt for license information. # See https://llvm.org/LICENSE.txt for license information.
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# #
#===----------------------------------------------------------------------===## #===----------------------------------------------------------------------===##
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h") set(PARALLELSTL_VERSION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/include/pstl/internal/pstl_config.h")
file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$") file(STRINGS "${PARALLELSTL_VERSION_FILE}" PARALLELSTL_VERSION_SOURCE REGEX "#define _PSTL_VERSION .*$")
string(REGEX REPLACE "#define _PSTL_VERSION (.*)$" "\\1" PARALLELSTL_VERSION_SOURCE "${PARALLELSTL_VERSION_SOURCE}") string(REGEX REPLACE "#define _PSTL_VERSION (.*)$" "\\1" PARALLELSTL_VERSION_SOURCE "${PARALLELSTL_VERSION_SOURCE}")
math(EXPR VERSION_MAJOR "(${PARALLELSTL_VERSION_SOURCE} / 1000)") math(EXPR VERSION_MAJOR "(${PARALLELSTL_VERSION_SOURCE} / 1000)")
math(EXPR VERSION_MINOR "((${PARALLELSTL_VERSION_SOURCE} % 1000) / 10)") math(EXPR VERSION_MINOR "((${PARALLELSTL_VERSION_SOURCE} % 1000) / 10)")
math(EXPR VERSION_PATCH "(${PARALLELSTL_VERSION_SOURCE} % 10)") math(EXPR VERSION_PATCH "(${PARALLELSTL_VERSION_SOURCE} % 10)")
▲ Show 20 Lines • Show All 86 Lines • Show Last 20 Lines

runtimes/CMakeLists.txt

# This file handles building LLVM runtime sub-projects. # This file handles building LLVM runtime sub-projects.
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.20.0)
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)
# Add path for custom and the LLVM build's modules to the CMake module path. # 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") 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 list(INSERT CMAKE_MODULE_PATH 0
"${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
"${LLVM_COMMON_CMAKE_UTILS}" "${LLVM_COMMON_CMAKE_UTILS}"
"${LLVM_COMMON_CMAKE_UTILS}/Modules" "${LLVM_COMMON_CMAKE_UTILS}/Modules"
"${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake"
"${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake/modules" "${CMAKE_CURRENT_SOURCE_DIR}/../llvm/cmake/modules"
) )
▲ Show 20 Lines • Show All 279 Lines • Show Last 20 Lines