aboutsummaryrefslogtreecommitdiff
path: root/package/cmake/0001-rename_cmake_rootfile.patch
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-15 09:52:26 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-15 09:52:26 +0200
commit8428dbd88e1531abf0628f3308c234bcf28e9921 (patch)
tree63b4980e424ce3a54196971ceeb1b90ed33e9393 /package/cmake/0001-rename_cmake_rootfile.patch
parent554ec255c853191809fdae2333620c2934d9e8d3 (diff)
downloadbuildroot-8428dbd88e1531abf0628f3308c234bcf28e9921.tar.gz
buildroot-8428dbd88e1531abf0628f3308c234bcf28e9921.tar.bz2
Revert "cmake: bump version to 3.6.0"
This reverts commit b6ff742ca0d8b2901036d3ad03fe60c6b2a7725f. This bump causes numerous build failures, so Vicente and Yann proposed to revert it. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/cmake/0001-rename_cmake_rootfile.patch')
-rw-r--r--package/cmake/0001-rename_cmake_rootfile.patch27
1 files changed, 11 insertions, 16 deletions
diff --git a/package/cmake/0001-rename_cmake_rootfile.patch b/package/cmake/0001-rename_cmake_rootfile.patch
index 3169f16850..915b7e32bb 100644
--- a/package/cmake/0001-rename_cmake_rootfile.patch
+++ b/package/cmake/0001-rename_cmake_rootfile.patch
@@ -6,23 +6,18 @@ This buildroot-specific patch makes sure ctest looks also for
"Modules/CMake.cmake.ctest" before complaining
Signed-off-by: Davide Viti <zinosat@tiscali.it>
-[Vincent: tweak patch for 3.6.0]
-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);
+--- cmake-3.0.2/Source/cmake.cxx~ 2014-09-11 15:24:01.000000000 +0200
++++ cmake-3.0.2/Source/cmake.cxx 2014-11-25 15:48:04.461033690 +0100
+@@ -957,7 +957,10 @@
+ "Path to cpack program executable.", cmCacheManager::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()
-+ )
+ 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"
+ cmSystemTools::Error("Could not find CMAKE_ROOT !!!\n"