diff options
author | 2019-10-27 08:40:14 -0600 | |
---|---|---|
committer | 2019-10-28 23:00:13 +0100 | |
commit | ce34cf0ae3a5c8de31c23f758bf4881d758cd756 (patch) | |
tree | 0b60d0eacf621940531bc55dfb1464616a3480cf /package/cmake/0001-rename_cmake_rootfile.patch | |
parent | 7991f09307320935b9271797212ed71b4532c647 (diff) | |
download | buildroot-ce34cf0ae3a5c8de31c23f758bf4881d758cd756.tar.gz buildroot-ce34cf0ae3a5c8de31c23f758bf4881d758cd756.tar.bz2 |
cmake: bump to version 3.15.4
Remove FindLibUV patch which is now upstream.
Resync/reformat rename cmake rootfile patch for 3.15.4 with git
format-patch.
Copyright.txt has updated copyright year and added some authors.
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Diffstat (limited to 'package/cmake/0001-rename_cmake_rootfile.patch')
-rw-r--r-- | package/cmake/0001-rename_cmake_rootfile.patch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/package/cmake/0001-rename_cmake_rootfile.patch b/package/cmake/0001-rename_cmake_rootfile.patch deleted file mode 100644 index 8c168c15a8..0000000000 --- a/package/cmake/0001-rename_cmake_rootfile.patch +++ /dev/null @@ -1,29 +0,0 @@ -ctest fails on the target, because it cannot find CMake.cmake inside -CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake -files are removed at build time via the target-finalize rule. - -This buildroot-specific patch makes sure ctest looks also for -"Modules/CMake.cmake.ctest" before complaining - -[Vincent: tweak patch for 3.6.3] - -Signed-off-by: Davide Viti <zinosat@tiscali.it> -Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> - -diff -rup a/Source/cmake.cxx b/Source/cmake.cxx ---- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100 -+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100 -@@ -771,7 +771,12 @@ int cmake::AddCMakePaths() - "Path to cpack program executable.", cmState::INTERNAL); - #endif - if (!cmSystemTools::FileExists( -- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) { -+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) && -+ !cmSystemTools::FileExists( -+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str() -+ ) -+ ) -+ { - // couldn't find modules - cmSystemTools::Error( - "Could not find CMAKE_ROOT !!!\n" |