aboutsummaryrefslogtreecommitdiff
path: root/package/cmake/0001-rename_cmake_rootfile.patch
diff options
context:
space:
mode:
authorGravatar Vicente Olivert Riera <Vincent.Riera@imgtec.com>2016-07-14 11:06:50 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-07-14 12:23:14 +0200
commitb6ff742ca0d8b2901036d3ad03fe60c6b2a7725f (patch)
tree247bc5f451ff8be3930ff2ca6c1b13d61f84ac32 /package/cmake/0001-rename_cmake_rootfile.patch
parentc88d54746069562a3a3b9a5c1e2c69f7692c5f5c (diff)
downloadbuildroot-b6ff742ca0d8b2901036d3ad03fe60c6b2a7725f.tar.gz
buildroot-b6ff742ca0d8b2901036d3ad03fe60c6b2a7725f.tar.bz2
cmake: bump version to 3.6.0
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 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, 16 insertions, 11 deletions
diff --git a/package/cmake/0001-rename_cmake_rootfile.patch b/package/cmake/0001-rename_cmake_rootfile.patch
index 915b7e32bb..3169f16850 100644
--- a/package/cmake/0001-rename_cmake_rootfile.patch
+++ b/package/cmake/0001-rename_cmake_rootfile.patch
@@ -6,18 +6,23 @@ 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>
---- 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);
+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())
+ 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"