summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2009-07-11 20:27:28 (GMT)
committerAlexander Neundorf <neundorf@kde.org>2009-07-11 20:27:28 (GMT)
commita605bd5225ce062670f50b3a6a8e0b84be002bb1 (patch)
tree1663d37836632e5ec57589bcacdf5e012cdbea52
parentf888a0efafafeb20753fa250deb2675bb627c595 (diff)
downloadCMake-a605bd5225ce062670f50b3a6a8e0b84be002bb1.zip
CMake-a605bd5225ce062670f50b3a6a8e0b84be002bb1.tar.gz
CMake-a605bd5225ce062670f50b3a6a8e0b84be002bb1.tar.bz2
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
-rw-r--r--Source/CTest/cmCTestScriptHandler.cxx8
-rw-r--r--Source/CTest/cmCTestScriptHandler.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/Source/CTest/cmCTestScriptHandler.cxx b/Source/CTest/cmCTestScriptHandler.cxx
index 38a406a..6476d54 100644
--- a/Source/CTest/cmCTestScriptHandler.cxx
+++ b/Source/CTest/cmCTestScriptHandler.cxx
@@ -117,7 +117,7 @@ void cmCTestScriptHandler::Initialize()
this->CTestCmd = "";
this->UpdateCmd = "";
this->CTestEnv = "";
- this->InitCache = "";
+ this->InitialCache = "";
this->CMakeCmd = "";
this->CMOutFile = "";
this->ExtraUpdates.clear();
@@ -488,7 +488,7 @@ int cmCTestScriptHandler::ExtractVariables()
}
this->CTestEnv
= this->Makefile->GetSafeDefinition("CTEST_ENVIRONMENT");
- this->InitCache
+ this->InitialCache
= this->Makefile->GetSafeDefinition("CTEST_INITIAL_CACHE");
this->CMakeCmd
= this->Makefile->GetSafeDefinition("CTEST_CMAKE_COMMAND");
@@ -879,7 +879,7 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
}
// put the initial cache into the bin dir
- if (!this->InitCache.empty())
+ if (!this->InitialCache.empty())
{
std::string cacheFile = this->BinaryDir;
cacheFile += "/CMakeCache.txt";
@@ -890,7 +890,7 @@ int cmCTestScriptHandler::RunConfigurationDashboard()
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
// before closing it. This will ensure the file is finished before
diff --git a/Source/CTest/cmCTestScriptHandler.h b/Source/CTest/cmCTestScriptHandler.h
index ba59a33..c44cff0 100644
--- a/Source/CTest/cmCTestScriptHandler.h
+++ b/Source/CTest/cmCTestScriptHandler.h
@@ -151,7 +151,7 @@ private:
cmStdString CTestCmd;
cmStdString UpdateCmd;
cmStdString CTestEnv;
- cmStdString InitCache;
+ cmStdString InitialCache;
cmStdString CMakeCmd;
cmStdString CMOutFile;
std::vector<cmStdString> ExtraUpdates;