diff options
| author | Vicente Olivert Riera <Vincent.Riera@imgtec.com> | 2016-07-14 11:06:50 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2016-07-14 12:23:14 +0200 |
| commit | b6ff742ca0d8b2901036d3ad03fe60c6b2a7725f (patch) | |
| tree | 247bc5f451ff8be3930ff2ca6c1b13d61f84ac32 | |
| parent | c88d54746069562a3a3b9a5c1e2c69f7692c5f5c (diff) | |
| download | buildroot-b6ff742ca0d8b2901036d3ad03fe60c6b2a7725f.tar.gz buildroot-b6ff742ca0d8b2901036d3ad03fe60c6b2a7725f.zip | |
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>
| -rw-r--r-- | package/cmake/0001-rename_cmake_rootfile.patch | 27 | ||||
| -rw-r--r-- | package/cmake/cmake.hash | 4 | ||||
| -rw-r--r-- | package/cmake/cmake.mk | 4 |
3 files changed, 20 insertions, 15 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" diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index e40d4ea39a..7cd1133289 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.5/cmake-3.5.2-SHA-256.txt -sha256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a cmake-3.5.2.tar.gz +# From http://www.cmake.org/files/v3.6/cmake-3.6.0-SHA-256.txt +sha256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 cmake-3.6.0.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 7a80c1bfef..25eafe8cf4 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.5 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).2 +CMAKE_VERSION_MAJOR = 3.6 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt |
