X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=blobdiff_plain;f=cmake-old1.patch;fp=cmake-old.patch;h=5435bbb59ea90ad6cd31119961c5430fbce6cb41;hp=c6493ced62964f31f1574584bf3d2aa284ec55d9;hb=7bf987842cc0c4c61188ad18d8512a5b29c2222b;hpb=d4f5769507bb82049f82b49f42781b152dc68fb0;ds=sidebyside diff --git a/cmake-old.patch b/cmake-old1.patch similarity index 61% rename from cmake-old.patch rename to cmake-old1.patch index c6493ce..5435bbb 100644 --- a/cmake-old.patch +++ b/cmake-old1.patch @@ -1,5 +1,3 @@ -revert: - commit 1d3f61f8a799489f7f4d81e46d9e6b31a954ea4e Author: Louis Dionne Date: Wed Apr 22 11:16:27 2020 -0400 @@ -16,20 +14,22 @@ Date: Wed Apr 22 11:16:27 2020 -0400 Differential Revision: https://reviews.llvm.org/D78646 +diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt +index d144266b20f..303b39221d9 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt -@@ -3,9 +3,11 @@ +@@ -3,11 +3,9 @@ cmake_minimum_required(VERSION 3.4.3) if ("${CMAKE_VERSION}" VERSION_LESS "3.13.4") -- message(FATAL_ERROR -- "Your CMake version is ${CMAKE_VERSION}. The minimum version of CMake " -- "required to build LLVM is now 3.13.4.") -+ message(WARNING -+ "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 12.0.0, the " -+ "minimum version of CMake required to build LLVM will become 3.13.4, and " -+ "using an older CMake will become an error. Please upgrade your CMake to " -+ "at least 3.13.4 now to avoid issues in the future!") +- message(WARNING +- "Your CMake version is ${CMAKE_VERSION}. Starting with LLVM 12.0.0, the " +- "minimum version of CMake required to build LLVM will become 3.13.4, and " +- "using an older CMake will become an error. Please upgrade your CMake to " +- "at least 3.13.4 now to avoid issues in the future!") ++ message(FATAL_ERROR ++ "Your CMake version is ${CMAKE_VERSION}. The minimum version of CMake " ++ "required to build LLVM is now 3.13.4.") endif() if(POLICY CMP0068)