caio/clang-p2996
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Harmonize cmake_policy() across standalone builds of all projects"

Browse Source 
This reverts commit 88d7508dc4.
It's reported to break builds when symlinking other projects inside
the `tools` directory.
This commit is contained in:
Michał Górny
2022-10-27 14:30:02 +02:00
parent 17c65e51b9
commit 687e5bccf8
8 changed files with 19 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clang/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
cmake_minimum_required(VERSION 3.13.4)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
# If we are not building as a part of LLVM, build Clang as an
# standalone project, using LLVM as an external library:

12
cmake/Modules/CMakePolicy.cmake
View File

@@ -1,12 +0,0 @@
# CMake policy settings shared between LLVM projects
# 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)
cmake_policy(SET CMP0114 OLD)
endif()
# CMP0116: Ninja generators transform `DEPFILE`s from `add_custom_command()`
# New in CMake 3.20. https://cmake.org/cmake/help/latest/policy/CMP0116.html
if(POLICY CMP0116)
cmake_policy(SET CMP0116 OLD)
endif()

2
flang/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
cmake_minimum_required(VERSION 3.13.4)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)

2
lld/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
cmake_minimum_required(VERSION 3.13.4)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
# If we are not building as a part of LLVM, build LLD as an
# standalone project, using LLVM as an external library:

2
lldb/CMakeLists.txt
View File

@@ -1,6 +1,4 @@
cmake_minimum_required(VERSION 3.13.4)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
# Add path for custom modules.
set(CMAKE_MODULE_PATH

6
lldb/cmake/modules/LLDBStandalone.cmake
View File

@@ -1,3 +1,9 @@
# CMP0116: Ninja generators transform `DEPFILE`s from `add_custom_command()`
# New in CMake 3.20. https://cmake.org/cmake/help/latest/policy/CMP0116.html
if(POLICY CMP0116)
cmake_policy(SET CMP0116 OLD)
endif()
if(NOT DEFINED LLVM_COMMON_CMAKE_UTILS)
set(LLVM_COMMON_CMAKE_UTILS ${CMAKE_CURRENT_SOURCE_DIR}/../cmake)
endif()

13
llvm/CMakeLists.txt
View File

@@ -1,8 +1,17 @@
# See docs/CMake.html for instructions about how to build LLVM with CMake.
cmake_minimum_required(VERSION 3.13.4)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
# 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)
cmake_policy(SET CMP0114 OLD)
endif()
# CMP0116: Ninja generators transform `DEPFILE`s from `add_custom_command()`
# New in CMake 3.20. https://cmake.org/cmake/help/latest/policy/CMP0116.html
if(POLICY CMP0116)
cmake_policy(SET CMP0116 OLD)
endif()
set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)

5
mlir/CMakeLists.txt
View File

@@ -1,7 +1,4 @@
# MLIR project.
cmake_minimum_required(VERSION 3.13.4)
include(${CMAKE_CURRENT_SOURCE_DIR}/../cmake/Modules/CMakePolicy.cmake
NO_POLICY_SCOPE)
# Check if MLIR is built as a standalone project.
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
@@ -13,6 +10,8 @@ endif()
include(GNUInstallDirs)
if(MLIR_STANDALONE_BUILD)
cmake_minimum_required(VERSION 3.13.4)
find_package(LLVM CONFIG REQUIRED)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LLVM_CMAKE_DIR})
include(HandleLLVMOptions)