diff options
| author | FeRD (Frank Dana) <ferdnyc@gmail.com> | 2022-06-12 17:29:25 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2022-06-13 13:05:24 (GMT) |
| commit | 98a10290a854a78cbe0a804a3d69313acd6f4339 (patch) | |
| tree | 946c4f2444fb4be62d25906875a8e6517b1c1f86 /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 7116712771538be9f093b6ae7f4ef5ce38fc3679 (diff) | |
| download | CMake-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/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 3726aa4..acaed36 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -604,7 +604,7 @@ void cmGlobalNinjaGenerator::Generate() this->WriteUnknownExplicitDependencies(*this->GetCommonFileStream()); this->WriteBuiltinTargets(*this->GetCommonFileStream()); - if (cmSystemTools::GetErrorOccuredFlag()) { + if (cmSystemTools::GetErrorOccurredFlag()) { this->RulesFileStream->setstate(std::ios::failbit); for (auto const& config : this->Makefiles[0]->GetGeneratorConfigs( cmMakefile::IncludeEmptyConfig)) { @@ -651,7 +651,7 @@ void cmGlobalNinjaGenerator::CleanMetaData() "'\n" "failed with:\n ", error)); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); } }; @@ -710,7 +710,7 @@ bool cmGlobalNinjaGenerator::FindMakeProgram(cmMakefile* mf) "'\n" "failed with:\n ", error)); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); return false; } this->NinjaVersion = cmTrimWhitespace(version); @@ -790,7 +790,7 @@ void cmGlobalNinjaGenerator::CheckNinjaCodePage() "'\n" "failed with:\n ", error)); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); } else if (result == 0) { std::istringstream outputStream(output); std::string line; @@ -837,7 +837,7 @@ bool cmGlobalNinjaGenerator::CheckLanguages( mf->IssueMessage(MessageType::FATAL_ERROR, "multiple values for CMAKE_OSX_ARCHITECTURES not " "supported with Swift"); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); return false; } } @@ -870,7 +870,7 @@ bool cmGlobalNinjaGenerator::CheckCxxModuleSupport() ; /* clang-format on */ this->GetCMakeInstance()->IssueMessage(MessageType::FATAL_ERROR, e.str()); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); } return false; } @@ -891,7 +891,7 @@ bool cmGlobalNinjaGenerator::CheckFortran(cmMakefile* mf) const ; /* clang-format on */ mf->IssueMessage(MessageType::FATAL_ERROR, e.str()); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); return false; } @@ -912,7 +912,7 @@ bool cmGlobalNinjaGenerator::CheckISPC(cmMakefile* mf) const ; /* clang-format on */ mf->IssueMessage(MessageType::FATAL_ERROR, e.str()); - cmSystemTools::SetFatalErrorOccured(); + cmSystemTools::SetFatalErrorOccurred(); return false; } |