This is an archive of the discontinued LLVM Phabricator instance.

Differential D94374

[CMake] Remove dead code setting policies to NEW
ClosedPublic

Authored by tambre on Jan 10 2021, 4:18 AM.

Details

Reviewers
phosek
lebedev.ri
ldionne
Group Reviewers
Restricted Project
Restricted Project
Restricted Project
Commits
rG480643a95cd1: [CMake] Remove dead code setting policies to NEW
Summary

cmake_minimum_required(VERSION) calls cmake_policy(VERSION),
which sets all policies up to VERSION to NEW.
LLVM started requiring CMake 3.13 last year, so we can remove
a bunch of code setting policies prior to 3.13 to NEW as it
no longer has any effect.

Diff Detail

Event Timeline

tambre created this revision.Jan 10 2021, 4:18 AM
Herald added a reviewer: lebedev.ri. · View Herald TranscriptJan 10 2021, 4:18 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: libcxx-commits, teijeong, rdzhabarov and 18 others. · View Herald Transcript
tambre requested review of this revision.Jan 10 2021, 4:18 AM
Herald added projects: Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project, Restricted Project. · View Herald TranscriptJan 10 2021, 4:18 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added subscribers: llvm-commits, lldb-commits, Restricted Project and 3 others. · View Herald Transcript
Harbormaster completed remote builds in B84612: Diff 315662.Jan 10 2021, 5:21 AM
Herald added a subscriber: JDevlieghere. · View Herald TranscriptJan 10 2021, 5:21 AM
JDevlieghere added a comment.Jan 10 2021, 6:50 PM

LGTM for LLDB

phosek accepted this revision.Jan 10 2021, 11:30 PM

LGTM

tambre added a reviewer: ldionne.Jan 10 2021, 11:32 PM

ldionne: for libc++ review

ldionne requested changes to this revision.Jan 11 2021, 8:52 AM

Except for the google-benchmark nit, LGTM. Thanks a lot for the cleanup!

libcxx/utils/google-benchmark/CMakeLists.txt
3 ↗(On Diff #315662)

I don't think we want to change this. It's a third-party project (which is inconveniently checked-in as-is into our tree..).

This revision now requires changes to proceed.Jan 11 2021, 8:52 AM
tambre updated this revision to Diff 315847.Jan 11 2021, 10:00 AM

Don't modify third-party checked-in libraries.

tambre marked an inline comment as done.Jan 11 2021, 10:03 AM
tambre added inline comments.
libcxx/utils/google-benchmark/CMakeLists.txt
3 ↗(On Diff #315662)

Good catch. Did the same for llvm/utils/benchmark/CMakeLists.txt, though that one seems to have the cmake_minimum_required(VERSION) updated to 3.13.4 unlike this one.

Harbormaster completed remote builds in B84719: Diff 315847.Jan 11 2021, 11:05 AM
tambre marked an inline comment as done.Jan 17 2021, 11:42 PM

ldionne: ping

ldionne accepted this revision.Jan 18 2021, 9:06 AM

Thanks!

This revision is now accepted and ready to land.Jan 18 2021, 9:06 AM
Closed by commit rG480643a95cd1: [CMake] Remove dead code setting policies to NEW (authored by tambre). · Explain WhyJan 19 2021, 7:19 AM
This revision was automatically updated to reflect the committed changes.
tambre added a commit: rG480643a95cd1: [CMake] Remove dead code setting policies to NEW.

Revision Contents

PathSize
clang/
4 lines
compiler-rt/
4 lines
flang/
16 lines
libcxx/
11 lines
utils/
ci/
runtimes/
16 lines
libcxxabi/
4 lines
libunwind/
4 lines
lldb/
8 lines
llvm/
13 lines
mlir/
examples/
standalone/
16 lines

Diff 317559

clang/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
# 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(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_CXX_STANDARD_REQUIRED YES)
set(CMAKE_CXX_EXTENSIONS NO) set(CMAKE_CXX_EXTENSIONS NO)
▲ Show 20 Lines • Show All 874 Lines • Show Last 20 Lines

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.13.4)
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
# 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)
endif() endif()
# Add path for custom compiler-rt modules. # Add path for custom compiler-rt modules.
▲ Show 20 Lines • Show All 617 Lines • Show Last 20 Lines

flang/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
# RPATH settings on macOS do not affect INSTALL_NAME.
if (POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
endif()
# Include file check macros honor CMAKE_REQUIRED_LIBRARIES.
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
# option() honors normal variables.
if (POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
option(LINK_WITH_FIR "Link driver with FIR and LLVM" ON) option(LINK_WITH_FIR "Link driver with FIR and LLVM" ON)
option(FLANG_BUILD_NEW_DRIVER "Build the flang compiler driver" OFF) option(FLANG_BUILD_NEW_DRIVER "Build the flang compiler driver" OFF)
# Flang requires C++17. # Flang requires C++17.
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)
▲ Show 20 Lines • Show All 433 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.
if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxxabi") if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxxabi")
message(FATAL_ERROR "libc++ now requires being built in a monorepo layout with libcxxabi available") message(FATAL_ERROR "libc++ now requires being built in a monorepo layout with libcxxabi available")
endif() endif()
#=============================================================================== #===============================================================================
# Setup Project # Setup Project
#=============================================================================== #===============================================================================
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default
endif()
if(POLICY CMP0022)
cmake_policy(SET CMP0022 NEW) # Required when interacting with LLVM and Clang
endif()
if(POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
endif()
# Add path for custom modules # Add path for custom modules
set(CMAKE_MODULE_PATH set(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"
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
) )
▲ Show 20 Lines • Show All 904 Lines • Show Last 20 Lines

libcxx/utils/ci/runtimes/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
project(LLVM_RUNTIMES)
if(POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
endif()
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
project(LLVM_RUNTIMES)
find_package(Python3 COMPONENTS Interpreter) find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND) if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback") message(WARNING "Python3 not found, using python2 as a fallback")
find_package(Python2 COMPONENTS Interpreter REQUIRED) find_package(Python2 COMPONENTS Interpreter REQUIRED)
if(Python2_VERSION VERSION_LESS 2.7) if(Python2_VERSION VERSION_LESS 2.7)
message(SEND_ERROR "Python 2.7 or newer is required") message(SEND_ERROR "Python 2.7 or newer is required")
endif() endif()
Show All 34 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.
if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx") if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx")
message(FATAL_ERROR "libc++abi now requires being built in a monorepo layout with libcxx available") message(FATAL_ERROR "libc++abi now requires being built in a monorepo layout with libcxx available")
endif() endif()
#=============================================================================== #===============================================================================
# Setup Project # Setup Project
#=============================================================================== #===============================================================================
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
if(POLICY CMP0042)
cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default
endif()
# Add path for custom modules # Add path for custom modules
set(CMAKE_MODULE_PATH set(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"
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
) )
set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
▲ Show 20 Lines • Show All 487 Lines • Show Last 20 Lines

libunwind/CMakeLists.txt

if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx") if (NOT IS_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}/../libcxx")
message(FATAL_ERROR "libunwind requires being built in a monorepo layout with libcxx available") message(FATAL_ERROR "libunwind requires being built in a monorepo layout with libcxx available")
endif() endif()
#=============================================================================== #===============================================================================
# Setup Project # Setup Project
#=============================================================================== #===============================================================================
cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
if (POLICY CMP0042)
cmake_policy(SET CMP0042 NEW) # Set MACOSX_RPATH=YES by default
endif()
# Add path for custom modules # Add path for custom modules
set(CMAKE_MODULE_PATH set(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"
${CMAKE_MODULE_PATH} ${CMAKE_MODULE_PATH}
) )
set(LIBUNWIND_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(LIBUNWIND_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
▲ Show 20 Lines • Show All 331 Lines • Show Last 20 Lines

lldb/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
# 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,
▲ Show 20 Lines • Show All 87 Lines • Show Last 20 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.13.4)
if(POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
endif()
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
if(NOT DEFINED LLVM_VERSION_MAJOR) if(NOT DEFINED LLVM_VERSION_MAJOR)
set(LLVM_VERSION_MAJOR 12) set(LLVM_VERSION_MAJOR 12)
endif() endif()
if(NOT DEFINED LLVM_VERSION_MINOR) if(NOT DEFINED LLVM_VERSION_MINOR)
set(LLVM_VERSION_MINOR 0) set(LLVM_VERSION_MINOR 0)
endif() endif()
if(NOT DEFINED LLVM_VERSION_PATCH) if(NOT DEFINED LLVM_VERSION_PATCH)
▲ Show 20 Lines • Show All 1,116 Lines • Show Last 20 Lines

mlir/examples/standalone/CMakeLists.txt

cmake_minimum_required(VERSION 3.13.4) cmake_minimum_required(VERSION 3.13.4)
project(standalone-dialect LANGUAGES CXX C)
if(POLICY CMP0068)
cmake_policy(SET CMP0068 NEW)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
endif()
if(POLICY CMP0075)
cmake_policy(SET CMP0075 NEW)
endif()
if(POLICY CMP0077)
cmake_policy(SET CMP0077 NEW)
endif()
project(standalone-dialect LANGUAGES CXX C)
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to") set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
find_package(MLIR REQUIRED CONFIG) find_package(MLIR REQUIRED CONFIG)
message(STATUS "Using MLIRConfig.cmake in: ${MLIR_DIR}") message(STATUS "Using MLIRConfig.cmake in: ${MLIR_DIR}")
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}") message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
Show All 23 Lines