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/CPack/cmCPackGenerator.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/CPack/cmCPackGenerator.cxx')
-rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 7ddb103..90d15f8 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -525,7 +525,7 @@ int cmCPackGenerator::InstallProjectViaInstallScript( this->SetOptionIfNotSet("CMAKE_CURRENT_SOURCE_DIR", tempInstallDirectory); bool res = this->MakefileMap->ReadListFile(installScript); - if (cmSystemTools::GetErrorOccuredFlag() || !res) { + if (cmSystemTools::GetErrorOccurredFlag() || !res) { return 0; } } @@ -973,7 +973,7 @@ int cmCPackGenerator::InstallCMakeProject( } } } - if (cmSystemTools::GetErrorOccuredFlag() || !res) { + if (cmSystemTools::GetErrorOccurredFlag() || !res) { return 0; } return 1; @@ -985,7 +985,7 @@ bool cmCPackGenerator::ReadListFile(const char* moduleName) std::string fullPath = this->MakefileMap->GetModulesFile(moduleName); retval = this->MakefileMap->ReadListFile(fullPath); // include FATAL_ERROR and ERROR in the return status - retval = retval && (!cmSystemTools::GetErrorOccuredFlag()); + retval = retval && (!cmSystemTools::GetErrorOccurredFlag()); return retval; } @@ -1117,7 +1117,7 @@ int cmCPackGenerator::DoPackage() this->MakefileMap->SetPolicyVersion(cmVersion::GetCMakeVersion(), std::string()); - if (!this->PackageFiles() || cmSystemTools::GetErrorOccuredFlag()) { + if (!this->PackageFiles() || cmSystemTools::GetErrorOccurredFlag()) { cmCPackLogger(cmCPackLog::LOG_ERROR, "Problem compressing the directory" << std::endl); return 0; @@ -1214,7 +1214,7 @@ int cmCPackGenerator::Initialize(const std::string& name, cmMakefile* mf) mf->ReadListFile(config); } int result = this->InitializeInternal(); - if (cmSystemTools::GetErrorOccuredFlag()) { + if (cmSystemTools::GetErrorOccurredFlag()) { return 0; } |