summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.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/cmGlobalGenerator.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/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 9d61de9..4cb541a 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -441,7 +441,7 @@ bool cmGlobalGenerator::FindMakeProgram(cmMakefile* mf)
<< this->GetName() << "\". CMAKE_MAKE_PROGRAM is not set. You "
<< "probably need to select a different build tool.";
cmSystemTools::Error(err.str());
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return false;
}
std::string makeProgram = mf->GetRequiredDefinition("CMAKE_MAKE_PROGRAM");
@@ -531,7 +531,7 @@ void cmGlobalGenerator::EnableLanguage(
if (languages.empty()) {
cmSystemTools::Error("EnableLanguage must have a lang specified!");
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
@@ -543,7 +543,7 @@ void cmGlobalGenerator::EnableLanguage(
<< "' is currently being enabled. "
"Recursive call not allowed.";
mf->IssueMessage(MessageType::FATAL_ERROR, e.str());
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
}
@@ -560,7 +560,7 @@ void cmGlobalGenerator::EnableLanguage(
<< " which is not enabled.";
this->TryCompileOuterMakefile->IssueMessage(MessageType::FATAL_ERROR,
e.str());
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
}
@@ -659,28 +659,28 @@ void cmGlobalGenerator::EnableLanguage(
// Tell the generator about the instance, if any.
std::string instance = mf->GetSafeDefinition("CMAKE_GENERATOR_INSTANCE");
if (!this->SetGeneratorInstance(instance, mf)) {
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
// Tell the generator about the target system.
std::string system = mf->GetSafeDefinition("CMAKE_SYSTEM_NAME");
if (!this->SetSystemName(system, mf)) {
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
// Tell the generator about the platform, if any.
std::string platform = mf->GetSafeDefinition("CMAKE_GENERATOR_PLATFORM");
if (!this->SetGeneratorPlatform(platform, mf)) {
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
// Tell the generator about the toolset, if any.
std::string toolset = mf->GetSafeDefinition("CMAKE_GENERATOR_TOOLSET");
if (!this->SetGeneratorToolset(toolset, false, mf)) {
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
return;
}
@@ -785,7 +785,7 @@ void cmGlobalGenerator::EnableLanguage(
cmSystemTools::Error("Could not find cmake module file: " +
determineCompiler);
}
- if (cmSystemTools::GetFatalErrorOccured()) {
+ if (cmSystemTools::GetFatalErrorOccurred()) {
return;
}
needTestLanguage[lang] = true;
@@ -954,7 +954,7 @@ void cmGlobalGenerator::EnableLanguage(
}
if (fatalError) {
- cmSystemTools::SetFatalErrorOccured();
+ cmSystemTools::SetFatalErrorOccurred();
}
for (std::string const& lang : cur_languages) {
@@ -1374,7 +1374,7 @@ void cmGlobalGenerator::Configure()
if (this->CMakeInstance->GetWorkingMode() == cmake::NORMAL_MODE) {
std::ostringstream msg;
- if (cmSystemTools::GetErrorOccuredFlag()) {
+ if (cmSystemTools::GetErrorOccurredFlag()) {
msg << "Configuring incomplete, errors occurred!";
const char* logs[] = { "CMakeOutput.log", "CMakeError.log", nullptr };
for (const char** log = logs; *log; ++log) {
@@ -1645,7 +1645,7 @@ void cmGlobalGenerator::Generate()
for (auto& buildExpSet : this->BuildExportSets) {
if (!buildExpSet.second->GenerateImportFile()) {
- if (!cmSystemTools::GetErrorOccuredFlag()) {
+ if (!cmSystemTools::GetErrorOccurredFlag()) {
this->GetCMakeInstance()->IssueMessage(MessageType::FATAL_ERROR,
"Could not write export file.");
}