1*4882a593SmuzhiyunFrom 68d3b1dfbbd2f54bf81986d1d733deaf66658b15 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Davide Viti <zinosat@tiscali.it> 3*4882a593SmuzhiyunDate: Thu, 14 Jul 2016 10:14:59 +0100 4*4882a593SmuzhiyunSubject: [PATCH] rename cmake rootfile 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunctest fails on the target, because it cannot find CMake.cmake inside 7*4882a593SmuzhiyunCMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake 8*4882a593Smuzhiyunfiles are removed at build time via the target-finalize rule. 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunThis buildroot-specific patch makes sure ctest looks also for 11*4882a593Smuzhiyun"Modules/CMake.cmake.ctest" before complaining 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun[Vincent: tweak patch for 3.6.3] 14*4882a593Smuzhiyun[James: tweak patch for 3.15.4] 15*4882a593Smuzhiyun 16*4882a593SmuzhiyunSigned-off-by: Davide Viti <zinosat@tiscali.it> 17*4882a593SmuzhiyunSigned-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> 18*4882a593SmuzhiyunSigned-off-by: James Hilliard <james.hilliard1@gmail.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun Source/cmake.cxx | 7 ++++++- 21*4882a593Smuzhiyun 1 file changed, 6 insertions(+), 1 deletion(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/Source/cmake.cxx b/Source/cmake.cxx 24*4882a593Smuzhiyunindex 3772f09985..c317e4af38 100644 25*4882a593Smuzhiyun--- a/Source/cmake.cxx 26*4882a593Smuzhiyun+++ b/Source/cmake.cxx 27*4882a593Smuzhiyun@@ -1009,7 +1009,12 @@ int cmake::AddCMakePaths() 28*4882a593Smuzhiyun "Path to cpack program executable.", cmStateEnums::INTERNAL); 29*4882a593Smuzhiyun #endif 30*4882a593Smuzhiyun if (!cmSystemTools::FileExists( 31*4882a593Smuzhiyun- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake"))) { 32*4882a593Smuzhiyun+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake")) && 33*4882a593Smuzhiyun+ !cmSystemTools::FileExists( 34*4882a593Smuzhiyun+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest") 35*4882a593Smuzhiyun+ ) 36*4882a593Smuzhiyun+ ) 37*4882a593Smuzhiyun+ { 38*4882a593Smuzhiyun // couldn't find modules 39*4882a593Smuzhiyun cmSystemTools::Error( 40*4882a593Smuzhiyun "Could not find CMAKE_ROOT !!!\n" 41*4882a593Smuzhiyun-- 42*4882a593Smuzhiyun2.20.1 43*4882a593Smuzhiyun 44