tambre updated this revision to Diff 315847.
tambre added a comment.
Don't modify third-party checked-in libraries.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D94374/new/
https://reviews.llvm.org/D94374
Files:
clang/CMakeLists.txt
compiler-rt/CMakeLists.txt
flang/CMakeLists.txt
libcxx/CMakeLists.txt
libcxx/utils/ci/runtimes/CMakeLists.txt
libcxxabi/CMakeLists.txt
libunwind/CMakeLists.txt
lldb/CMakeLists.txt
llvm/CMakeLists.txt
mlir/examples/standalone/CMakeLists.txt
Index: mlir/examples/standalone/CMakeLists.txt
===================================================================
--- mlir/examples/standalone/CMakeLists.txt
+++ mlir/examples/standalone/CMakeLists.txt
@@ -1,20 +1,8 @@
cmake_minimum_required(VERSION 3.13.4)
-
-if(POLICY CMP0068)
- cmake_policy(SET CMP0068 NEW)
- 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_BUILD_WITH_INSTALL_NAME_DIR ON)
+
set(CMAKE_CXX_STANDARD 14 CACHE STRING "C++ standard to conform to")
find_package(MLIR REQUIRED CONFIG)
Index: llvm/CMakeLists.txt
===================================================================
--- llvm/CMakeLists.txt
+++ llvm/CMakeLists.txt
@@ -2,18 +2,7 @@
cmake_minimum_required(VERSION 3.13.4)
-if(POLICY CMP0068)
- cmake_policy(SET CMP0068 NEW)
- 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()
+set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
if(NOT DEFINED LLVM_VERSION_MAJOR)
set(LLVM_VERSION_MAJOR 12)
Index: lldb/CMakeLists.txt
===================================================================
--- lldb/CMakeLists.txt
+++ lldb/CMakeLists.txt
@@ -1,13 +1,5 @@
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.
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
Index: libunwind/CMakeLists.txt
===================================================================
--- libunwind/CMakeLists.txt
+++ libunwind/CMakeLists.txt
@@ -8,10 +8,6 @@
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
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
Index: libcxxabi/CMakeLists.txt
===================================================================
--- libcxxabi/CMakeLists.txt
+++ libcxxabi/CMakeLists.txt
@@ -10,10 +10,6 @@
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
set(CMAKE_MODULE_PATH
"${CMAKE_CURRENT_SOURCE_DIR}/cmake"
Index: libcxx/utils/ci/runtimes/CMakeLists.txt
===================================================================
--- libcxx/utils/ci/runtimes/CMakeLists.txt
+++ libcxx/utils/ci/runtimes/CMakeLists.txt
@@ -1,20 +1,8 @@
cmake_minimum_required(VERSION 3.13.4)
-
-if(POLICY CMP0068)
- cmake_policy(SET CMP0068 NEW)
- 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)
+set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
+
find_package(Python3 COMPONENTS Interpreter)
if(NOT Python3_Interpreter_FOUND)
message(WARNING "Python3 not found, using python2 as a fallback")
Index: libcxx/CMakeLists.txt
===================================================================
--- libcxx/CMakeLists.txt
+++ libcxx/CMakeLists.txt
@@ -10,16 +10,7 @@
#===============================================================================
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)
-endif()
+set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
# Add path for custom modules
set(CMAKE_MODULE_PATH
Index: flang/CMakeLists.txt
===================================================================
--- flang/CMakeLists.txt
+++ flang/CMakeLists.txt
@@ -1,20 +1,6 @@
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)
-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()
+set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON)
option(LINK_WITH_FIR "Link driver with FIR and LLVM" ON)
option(FLANG_BUILD_NEW_DRIVER "Build the flang compiler driver" OFF)
Index: compiler-rt/CMakeLists.txt
===================================================================
--- compiler-rt/CMakeLists.txt
+++ compiler-rt/CMakeLists.txt
@@ -5,10 +5,6 @@
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.
if (CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR OR COMPILER_RT_STANDALONE_BUILD)
project(CompilerRT C CXX ASM)
Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -1,9 +1,5 @@
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
# standalone project, using LLVM as an external library:
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR )
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
