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/cmSystemTools.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/cmSystemTools.cxx')
| -rw-r--r-- | Source/cmSystemTools.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx index 512a5fa..351386a 100644 --- a/Source/cmSystemTools.cxx +++ b/Source/cmSystemTools.cxx @@ -156,8 +156,8 @@ static int cm_archive_read_open_file(struct archive* a, const char* file, bool cmSystemTools::s_RunCommandHideConsole = false; bool cmSystemTools::s_DisableRunCommandOutput = false; -bool cmSystemTools::s_ErrorOccured = false; -bool cmSystemTools::s_FatalErrorOccured = false; +bool cmSystemTools::s_ErrorOccurred = false; +bool cmSystemTools::s_FatalErrorOccurred = false; bool cmSystemTools::s_ForceUnixPaths = false; // replace replace with with as many times as it shows up in source. @@ -212,7 +212,7 @@ std::string cmSystemTools::HelpFileName(cm::string_view str) void cmSystemTools::Error(const std::string& m) { std::string message = "CMake Error: " + m; - cmSystemTools::s_ErrorOccured = true; + cmSystemTools::s_ErrorOccurred = true; cmSystemTools::Message(message, "Error"); } |