diff options
| author | Brad King <brad.king@kitware.com> | 2022-06-14 11:34:25 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-06-14 11:34:32 (GMT) |
| commit | 6207937a7864dde142180b6df847bd06aaaf85f0 (patch) | |
| tree | 946c4f2444fb4be62d25906875a8e6517b1c1f86 /Source/cmake.cxx | |
| parent | 7116712771538be9f093b6ae7f4ef5ce38fc3679 (diff) | |
| parent | 98a10290a854a78cbe0a804a3d69313acd6f4339 (diff) | |
| download | CMake-6207937a7864dde142180b6df847bd06aaaf85f0.zip CMake-6207937a7864dde142180b6df847bd06aaaf85f0.tar.gz CMake-6207937a7864dde142180b6df847bd06aaaf85f0.tar.bz2 | |
Merge topic 'spelling-occurred' into release-3.24
98a10290a8 cmSystemTools: Fix 'ErrorOccurred' spelling
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7353
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 12 |
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 |