diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Modules/CMakeBuildUtilities.cmake | 4 | ||||
| -rw-r--r-- | Source/cmCPluginAPI.cxx | 4 | ||||
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 4 | ||||
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 2 | ||||
| -rw-r--r-- | Source/cmExtraCodeLiteGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/cmFileTimes.cxx | 2 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 8 | ||||
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 4 | ||||
| -rw-r--r-- | Source/cmMakefile.cxx | 2 |
9 files changed, 16 insertions, 16 deletions
diff --git a/Source/Modules/CMakeBuildUtilities.cmake b/Source/Modules/CMakeBuildUtilities.cmake index c891fe9..21f04e6 100644 --- a/Source/Modules/CMakeBuildUtilities.cmake +++ b/Source/Modules/CMakeBuildUtilities.cmake @@ -4,7 +4,7 @@ # Originally it was a macro in the root `CMakeLists.txt` with the comment # "Simply to improve readability...". # However, as part of the modernization refactoring it was moved into a -# separate file cuz adding library alises wasn't possible inside the +# separate file cuz adding library aliases wasn't possible inside the # macro. #----------------------------------------------------------------------- @@ -170,7 +170,7 @@ else() CMAKE_SET_TARGET_FOLDER(cmcurl "Utilities/3rdParty") CMAKE_SET_TARGET_FOLDER(LIBCURL "Utilities/3rdParty") if(NOT CMAKE_USE_SYSTEM_NGHTTP2) - # Configure after curl to re-use some check results. + # Configure after curl to reuse some check results. add_subdirectory(Utilities/cmnghttp2) CMAKE_SET_TARGET_FOLDER(cmnghttp2 "Utilities/3rdParty") endif() diff --git a/Source/cmCPluginAPI.cxx b/Source/cmCPluginAPI.cxx index 655f4bc..2e6cd40 100644 --- a/Source/cmCPluginAPI.cxx +++ b/Source/cmCPluginAPI.cxx @@ -549,7 +549,7 @@ static void CCONV* cmGetSource(void* arg, const char* name) sf->SourceExtension = cmSystemTools::GetFilenameLastExtension(sf->FullPath); - // Store the proxy in the map so it can be re-used and deleted later. + // Store the proxy in the map so it can be reused and deleted later. i = cmCPluginAPISourceFiles.emplace(rsf, std::move(sf)).first; } return i->second.get(); @@ -584,7 +584,7 @@ static void* CCONV cmAddSource(void* arg, void* arg2) sf->SourceName = osf->SourceName; sf->SourceExtension = osf->SourceExtension; - // Store the proxy in the map so it can be re-used and deleted later. + // Store the proxy in the map so it can be reused and deleted later. auto* value = sf.get(); cmCPluginAPISourceFiles[rsf] = std::move(sf); return value; diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index b5a8419..1b1f640 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -178,7 +178,7 @@ guaranteed to be acyclic. The final list of items produced by this procedure consists of the original user link line followed by minimal additional items needed to satisfy dependencies. The final list is then filtered to de-duplicate -items that we know the linker will re-use automatically (shared libs). +items that we know the linker will reuse automatically (shared libs). */ @@ -382,7 +382,7 @@ cmComputeLinkDepends::Compute() for (size_t i : cmReverseRange(this->FinalLinkOrder)) { LinkEntry const& e = this->EntryList[i]; cmGeneratorTarget const* t = e.Target; - // Entries that we know the linker will re-use do not need to be repeated. + // Entries that we know the linker will reuse do not need to be repeated. bool uniquify = t && t->GetType() == cmStateEnums::SHARED_LIBRARY; if (!uniquify || emitted.insert(i).second) { this->FinalLinkEntries.push_back(e); diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index f54f550..297ae1d 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -2591,7 +2591,7 @@ std::string cmComputeLinkInformation::GetRPathString(bool for_install) const // If the rpath will be replaced at install time, prepare space. if (!for_install && this->RuntimeUseChrpath) { if (!rpath.empty()) { - // Add one trailing separator so the linker does not re-use the + // Add one trailing separator so the linker does not reuse the // rpath .dynstr entry for a symbol name that happens to match // the end of the rpath string. rpath += this->GetRuntimeSep(); diff --git a/Source/cmExtraCodeLiteGenerator.cxx b/Source/cmExtraCodeLiteGenerator.cxx index 7538a7f..5d2b045 100644 --- a/Source/cmExtraCodeLiteGenerator.cxx +++ b/Source/cmExtraCodeLiteGenerator.cxx @@ -59,7 +59,7 @@ void cmExtraCodeLiteGenerator::Generate() this->GlobalGenerator->GetProjectMap(); // loop projects and locate the root project. - // and extract the information for creating the worspace + // and extract the information for creating the workspace // root makefile for (auto const& it : projectMap) { cmLocalGenerator* lg = it.second[0]; diff --git a/Source/cmFileTimes.cxx b/Source/cmFileTimes.cxx index bd896f5..0aaab1d 100644 --- a/Source/cmFileTimes.cxx +++ b/Source/cmFileTimes.cxx @@ -70,7 +70,7 @@ bool cmFileTimes::Load(std::string const& fileName) { std::unique_ptr<Times> ptr; if (this->IsValid()) { - // Invalidate this and re-use times + // Invalidate this and reuse times ptr.swap(this->times); } else { ptr = cm::make_unique<Times>(); diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index f224ec1..930922c 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -6946,7 +6946,7 @@ cmLinkInterface const* cmGeneratorTarget::GetLinkInterface( cmHeadToLinkInterfaceMap& hm = this->GetHeadToLinkInterfaceMap(config); // If the link interface does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { head = hm.begin()->first; } @@ -7074,7 +7074,7 @@ const cmLinkInterfaceLibraries* cmGeneratorTarget::GetLinkInterfaceLibraries( : this->GetHeadToLinkInterfaceMap(config)); // If the link interface does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { head = hm.begin()->first; } @@ -7596,7 +7596,7 @@ const cmLinkInterface* cmGeneratorTarget::GetImportLinkInterface( : this->GetHeadToLinkInterfaceMap(config)); // If the link interface does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { headTarget = hm.begin()->first; } @@ -8156,7 +8156,7 @@ cmGeneratorTarget::GetLinkImplementationLibrariesInternal( : this->GetHeadToLinkImplementationMap(config)); // If the link implementation does not depend on the head target - // then re-use the one from the head we computed first. + // then reuse the one from the head we computed first. if (!hm.empty() && !hm.begin()->second.HadHeadSensitiveCondition) { head = hm.begin()->first; } diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index 933e754..bec389f 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1865,7 +1865,7 @@ bool cmGlobalGenerator::AddAutomaticSources() } lg->AddUnityBuild(gt.get()); lg->AddISPCDependencies(gt.get()); - // Targets that re-use a PCH are handled below. + // Targets that reuse a PCH are handled below. if (!gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) { lg->AddPchDependencies(gt.get()); } @@ -1877,7 +1877,7 @@ bool cmGlobalGenerator::AddAutomaticSources() if (!gt->CanCompileSources()) { continue; } - // Handle targets that re-use a PCH from an above-handled target. + // Handle targets that reuse a PCH from an above-handled target. if (gt->GetProperty("PRECOMPILE_HEADERS_REUSE_FROM")) { lg->AddPchDependencies(gt.get()); } diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 80f8a77..4a190db 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3721,7 +3721,7 @@ int cmMakefile::TryCompile(const std::string& srcdir, // make sure the same generator is used // use this program as the cmake to be run, it should not - // be run that way but the cmake object requires a vailid path + // be run that way but the cmake object requires a valid path cmake cm(cmake::RoleProject, cmState::Project, cmState::ProjectKind::TryCompile); auto gg = cm.CreateGlobalGenerator(this->GetGlobalGenerator()->GetName()); |