[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
ldionne accepted this revision. ldionne added a comment. This revision is now accepted and ready to land. Thanks! Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
This revision was automatically updated to reflect the committed changes. Closed by commit rG480643a95cd1: [CMake] Remove dead code setting policies to NEW (authored by tambre). 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)
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
tambre marked an inline comment as done. tambre added a comment. ldionne: ping Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
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
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
tambre marked an inline comment as done. tambre added inline comments. Comment at: libcxx/utils/google-benchmark/CMakeLists.txt:3 - -project (benchmark) - ldionne wrote: > 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..). 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. Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
ldionne requested changes to this revision. ldionne added a comment. This revision now requires changes to proceed. Except for the google-benchmark nit, LGTM. Thanks a lot for the cleanup! Comment at: libcxx/utils/google-benchmark/CMakeLists.txt:3 - -project (benchmark) - 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..). Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
JDevlieghere added a comment. LGTM for LLDB Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
phosek accepted this revision. phosek added a comment. LGTM Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
tambre created this revision. tambre added a reviewer: phosek. Herald added subscribers: libcxx-commits, teijeong, rdzhabarov, tatianashp, msifontes, jurahul, Kayjukh, grosul1, Joonsoo, liufengdb, aartbik, lucyrfox, mgester, arpith-jacob, antiagainst, shauheen, rriddle, mehdi_amini, lebedev.ri, arichardson, mgorny. Herald added a reviewer: lebedev.ri. Herald added a project: libunwind. Herald added a reviewer: libunwind. tambre requested review of this revision. Herald added subscribers: llvm-commits, lldb-commits, Sanitizers, cfe-commits, stephenneuendorffer, nicolasvasilache. Herald added projects: clang, Sanitizers, LLDB, libc++, libc++abi, MLIR, LLVM. Herald added a reviewer: libc++. Herald added a reviewer: libc++abi. 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. Repository: rG LLVM Github Monorepo 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 libcxx/utils/google-benchmark/CMakeLists.txt libcxxabi/CMakeLists.txt libunwind/CMakeLists.txt lldb/CMakeLists.txt llvm/CMakeLists.txt llvm/utils/benchmark/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/utils/benchmark/CMakeLists.txt === --- llvm/utils/benchmark/CMakeLists.txt +++ llvm/utils/benchmark/CMakeLists.txt @@ -1,22 +1,5 @@ cmake_minimum_required(VERSION 3.13.4) - -# Tell cmake 3.0+ that it's safe to clear the PROJECT_VERSION variable in the -# call to project() below. -if(POLICY CMP0048) - cmake_policy(SET CMP0048 NEW) -endif() - -project (benchmark) - -foreach(p -CMP0054 # CMake 3.1 -CMP0056 # export EXE_LINKER_FLAGS to try_run -CMP0057 # Support no if() IN_LIST operator -) - if(POLICY ${p}) -cmake_policy(SET ${p} NEW) - endif() -endforeach() +project(benchmark) option(BENCHMARK_ENABLE_TESTING "Enable testing of the benchmark library." ON) option(BENCHMARK_ENABLE_EXCEPTIONS "Enable the use of exceptions in the benchmark library." ON) 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/google-benchmark/CMakeLists.txt === --- libcxx/utils/google-benchmark/CMakeLists.txt +++
[Lldb-commits] [PATCH] D94374: [CMake] Remove dead code setting policies to NEW
tambre added a reviewer: ldionne. tambre added a comment. ldionne: for libc++ review Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D94374/new/ https://reviews.llvm.org/D94374 ___ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits