Bump buildroot to version 2017-02
TG-3 #closed
This commit is contained in:
@@ -5,19 +5,25 @@ 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
|
||||
|
||||
Signed-off-by: Davide Viti <zinosat@tiscali.it>
|
||||
[Vincent: tweak patch for 3.6.3]
|
||||
|
||||
--- 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);
|
||||
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())
|
||||
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"
|
||||
|
||||
Reference in New Issue
Block a user