summaryrefslogtreecommitdiffstats
path: root/Source/cmake.cxx
diff options
context:
space:
mode:
authorFeRD (Frank Dana) <ferdnyc@gmail.com>2022-06-12 17:29:25 (GMT)
committerBrad King <brad.king@kitware.com>2022-06-13 13:05:24 (GMT)
commit98a10290a854a78cbe0a804a3d69313acd6f4339 (patch)
tree946c4f2444fb4be62d25906875a8e6517b1c1f86 /Source/cmake.cxx
parent7116712771538be9f093b6ae7f4ef5ce38fc3679 (diff)
downloadCMake-98a10290a854a78cbe0a804a3d69313acd6f4339.zip
CMake-98a10290a854a78cbe0a804a3d69313acd6f4339.tar.gz
CMake-98a10290a854a78cbe0a804a3d69313acd6f4339.tar.bz2
cmSystemTools: Fix 'ErrorOccurred' spelling
Rename the booleans 's_ErrorOccured' and 's_FatalErrorOccured' to 's_ErrorOccurred' and 's_FatalErrorOccurred', respectively. Rename the getters and setters to 'Get[Fatal]ErrorOccurred' and 'Set[Fatal]ErrorOccurred', and fix all uses across the codebase.
Diffstat (limited to 'Source/cmake.cxx')
-rw-r--r--Source/cmake.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index d9ae75a..e6fa219 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2002,7 +2002,7 @@ int cmake::HandleDeleteCacheVariables(const std::string& var)
}
cmSystemTools::Message(warning.str());
// avoid reconfigure if there were errors
- if (!cmSystemTools::GetErrorOccuredFlag()) {
+ if (!cmSystemTools::GetErrorOccurredFlag()) {
// re-run configure
return this->Configure();
}
@@ -2287,7 +2287,7 @@ int cmake::ActualConfigure()
this->State->SaveVerificationScript(this->GetHomeOutputDirectory(),
this->Messenger.get());
this->SaveCache(this->GetHomeOutputDirectory());
- if (cmSystemTools::GetErrorOccuredFlag()) {
+ if (cmSystemTools::GetErrorOccurredFlag()) {
return -1;
}
return 0;
@@ -2401,7 +2401,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
{
// Process the arguments
this->SetArgs(args);
- if (cmSystemTools::GetErrorOccuredFlag()) {
+ if (cmSystemTools::GetErrorOccurredFlag()) {
return -1;
}
if (this->GetWorkingMode() == HELP_MODE) {
@@ -2458,7 +2458,7 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
// In script mode we terminate after running the script.
if (this->GetWorkingMode() != NORMAL_MODE) {
- if (cmSystemTools::GetErrorOccuredFlag()) {
+ if (cmSystemTools::GetErrorOccurredFlag()) {
return -1;
}
return 0;
@@ -2532,7 +2532,7 @@ int cmake::Generate()
if (this->WarnUnusedCli) {
this->RunCheckForUnusedVariables();
}
- if (cmSystemTools::GetErrorOccuredFlag()) {
+ if (cmSystemTools::GetErrorOccurredFlag()) {
return -1;
}
// Save the cache again after a successful Generate so that any internal
@@ -2892,7 +2892,7 @@ int cmake::CheckBuildSystem()
cmGlobalGenerator gg(&cm);
cmMakefile mf(&gg, cm.GetCurrentSnapshot());
if (!mf.ReadListFile(this->CheckBuildSystemArgument) ||
- cmSystemTools::GetErrorOccuredFlag()) {
+ cmSystemTools::GetErrorOccurredFlag()) {
if (verbose) {
std::ostringstream msg;
msg << "Re-run cmake error reading : " << this->CheckBuildSystemArgument