kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

STYLE: rename InitCache to InitialCache, since it contains the contents for 

the initial cache and is not e.g. a flag which shows whether the cache
should be initialized

Alex
This commit is contained in:
Alexander Neundorf 2009-07-11 16:27:28 -04:00
parent f888a0efaf
commit a605bd5225
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestScriptHandler.cxx
View File

@ -117,7 +117,7 @@ void cmCTestScriptHandler::Initialize()
this->CTestCmd = ""; this->CTestCmd = "";
this->UpdateCmd = ""; this->UpdateCmd = "";
this->CTestEnv = ""; this->CTestEnv = "";
this->InitCache = ""; this->InitialCache = "";
this->CMakeCmd = ""; this->CMakeCmd = "";
this->CMOutFile = ""; this->CMOutFile = "";
this->ExtraUpdates.clear(); this->ExtraUpdates.clear();
@ -488,7 +488,7 @@ int cmCTestScriptHandler::ExtractVariables()
} }
this->CTestEnv this->CTestEnv
= this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT"); = this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT");
this->InitCache this->InitialCache
= this->Makefile->GetSafeDefinition("CTEST_INITIAL_CACHE"); = this->Makefile->GetSafeDefinition("CTEST_INITIAL_CACHE");
this->CMakeCmd this->CMakeCmd
= this->Makefile->GetSafeDefinition("CTEST_CMAKE_COMMAND"); = this->Makefile->GetSafeDefinition("CTEST_CMAKE_COMMAND");
@ -879,7 +879,7 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
} }
// put the initial cache into the bin dir // put the initial cache into the bin dir
if (!this->InitCache.empty()) if (!this->InitialCache.empty())
{ {
std::string cacheFile = this->BinaryDir; std::string cacheFile = this->BinaryDir;
cacheFile += "/CMakeCache.txt"; cacheFile += "/CMakeCache.txt";
@ -890,7 +890,7 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
return 9; return 9;
} }
fout.write(this->InitCache.c_str(), this->InitCache.size()); fout.write(this->InitialCache.c_str(), this->InitialCache.size());
// Make sure the operating system has finished writing the file // Make sure the operating system has finished writing the file
// before closing it. This will ensure the file is finished before // before closing it. This will ensure the file is finished before

2
Source/CTest/cmCTestScriptHandler.h
View File

@ -151,7 +151,7 @@ private:
cmStdString CTestCmd; cmStdString CTestCmd;
cmStdString UpdateCmd; cmStdString UpdateCmd;
cmStdString CTestEnv; cmStdString CTestEnv;
cmStdString InitCache; cmStdString InitialCache;
cmStdString CMakeCmd; cmStdString CMakeCmd;
cmStdString CMOutFile; cmStdString CMOutFile;
std::vector<cmStdString> ExtraUpdates; std::vector<cmStdString> ExtraUpdates;