summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-20 13:09:29 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-11-20 13:10:37 (GMT)
commit4c1a6f2e238eccd2f911527293b2111cc0a45716 (patch)
tree0fe13f85a6d9660266463ad0c3b0e1a3ae3a9be1 /Source
parent9f155a38db0e08548f62e793e799d10e2ee612b5 (diff)
parentcdd741ebf997ffdbf7408e6e8ec5701c2389ffda (diff)
downloadCMake-4c1a6f2e238eccd2f911527293b2111cc0a45716.zip
CMake-4c1a6f2e238eccd2f911527293b2111cc0a45716.tar.gz
CMake-4c1a6f2e238eccd2f911527293b2111cc0a45716.tar.bz2
Merge topic 'ci-fedora-39'
cdd741ebf9 Merge branch 'backport-ci-fedora-39' into ci-fedora-39 9283b20659 ci: Suppress CPack/RPM tests pending fix for Fedora 39 18145e8745 ci: Update FindMPI test environment for mpich on Fedora 39 a8be80ccf2 ci: Drop now-unnecessary Clang rules for CXXModules tests 99238b23e9 ci: use Fedora 39 images and environments 57eadec617 ci: update Linux image to Fedora 39 653262162c clang-tidy module: Update to build against LLVM/Clang 17 2cf9a65835 clang-tidy: ignore warnings new in version 17 ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8983
Diffstat (limited to 'Source')
-rw-r--r--Source/CTest/cmCTestMemCheckHandler.cxx8
-rw-r--r--Source/Modules/CMakeBuildUtilities.cmake4
-rw-r--r--Source/cmCPluginAPI.cxx4
-rw-r--r--Source/cmComputeLinkDepends.cxx2
-rw-r--r--Source/cmComputeLinkInformation.cxx2
-rw-r--r--Source/cmExtraCodeLiteGenerator.cxx2
-rw-r--r--Source/cmFileTimes.cxx2
-rw-r--r--Source/cmGeneratorTarget.cxx8
-rw-r--r--Source/cmGlobalGenerator.cxx4
-rw-r--r--Source/cmMakefile.cxx2
10 files changed, 19 insertions, 19 deletions
diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx
index b51de84..b1afdc0 100644
--- a/Source/CTest/cmCTestMemCheckHandler.cxx
+++ b/Source/CTest/cmCTestMemCheckHandler.cxx
@@ -962,15 +962,15 @@ bool cmCTestMemCheckHandler::ProcessMemCheckValgrindOutput(
"== .*[0-9,]+ bytes in [0-9,]+ blocks are still reachable"
" in loss record [0-9,]+ of [0-9,]+");
cmsys::RegularExpression vgUMC(
- "== .*Conditional jump or move depends on uninitialised value\\(s\\)");
+ "== .*Conditional jump or move depends on uninitiali[sz]ed value\\(s\\)");
cmsys::RegularExpression vgUMR1(
- "== .*Use of uninitialised value of size [0-9,]+");
+ "== .*Use of uninitiali[sz]ed value of size [0-9,]+");
cmsys::RegularExpression vgUMR2("== .*Invalid read of size [0-9,]+");
cmsys::RegularExpression vgUMR3("== .*Jump to the invalid address ");
cmsys::RegularExpression vgUMR4(
"== .*Syscall param .* contains "
- "uninitialised or unaddressable byte\\(s\\)");
- cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitialised");
+ "uninitiali[sz]ed or unaddressable byte\\(s\\)");
+ cmsys::RegularExpression vgUMR5("== .*Syscall param .* uninitiali[sz]ed");
cmsys::RegularExpression vgIPW("== .*Invalid write of size [0-9,]+");
cmsys::RegularExpression vgABR("== .*pthread_mutex_unlock: mutex is "
"locked by a different thread");
diff --git a/Source/Modules/CMakeBuildUtilities.cmake b/Source/Modules/CMakeBuildUtilities.cmake
index 94896ab..4e7f0fe 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 ea9e51d..8a8f8bd 100644
--- a/Source/cmComputeLinkDepends.cxx
+++ b/Source/cmComputeLinkDepends.cxx
@@ -181,7 +181,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).
*/
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 adca9ce..8c46124 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -7014,7 +7014,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;
}
@@ -7142,7 +7142,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;
}
@@ -7664,7 +7664,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;
}
@@ -8224,7 +8224,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 3f9bcd5..b659c9b 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1884,7 +1884,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());
}
@@ -1896,7 +1896,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 e055a34..aafef44 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3728,7 +3728,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());