summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalVisualStudio8Generator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-08-01 13:31:21 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-08-01 13:31:45 (GMT)
commitd8b6a750a0c5fcba6b3b5e18cd677b44ba1221ed (patch)
tree035fa17676b16be224e575709825246ca67121da /Source/cmGlobalVisualStudio8Generator.cxx
parent08c637423c48f588c46d426bdafc1fd7b9e7bb86 (diff)
parentd58253d155b43b8af1d0b64412145625907e3d9e (diff)
downloadCMake-d8b6a750a0c5fcba6b3b5e18cd677b44ba1221ed.zip
CMake-d8b6a750a0c5fcba6b3b5e18cd677b44ba1221ed.tar.gz
CMake-d8b6a750a0c5fcba6b3b5e18cd677b44ba1221ed.tar.bz2
Merge topic 'windows-tidy-cmstrcat'
d58253d155 clang-tidy: fix `performance-faster-string-find` lints a19ec77200 clang-tidy: fix `readability-static-accessed-through-instance` lints 3d03629f20 cmWIXRichTextFormatWriter: remove identity cast 1df29567ac clang-tidy: fix `modernize-use-equals-default` lints 32fe862b8c clang-tidy: fix `readability-container-size-empty` lints 7eaab9a957 clang-tidy: fix `modernize-raw-string-literal` lints ffa49c23aa clang-tidy: fix `readability-else-after-return` lints 4489e9a85c clang-tidy: fix `modernize-use-auto` lints ... Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8668
Diffstat (limited to 'Source/cmGlobalVisualStudio8Generator.cxx')
-rw-r--r--Source/cmGlobalVisualStudio8Generator.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/Source/cmGlobalVisualStudio8Generator.cxx b/Source/cmGlobalVisualStudio8Generator.cxx
index acb20d1..2e87502 100644
--- a/Source/cmGlobalVisualStudio8Generator.cxx
+++ b/Source/cmGlobalVisualStudio8Generator.cxx
@@ -304,7 +304,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
for (const auto& gi : generators) {
stampFile = cmStrCat(gi->GetMakefile()->GetCurrentBinaryDirectory(),
"/CMakeFiles/generate.stamp");
- fout << stampFile << "\n";
+ fout << stampFile << '\n';
stamps.push_back(stampFile);
}
}
@@ -341,7 +341,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
std::string argS = cmStrCat("-S", lg.GetSourceDirectory());
std::string argB = cmStrCat("-B", lg.GetBinaryDirectory());
std::string const sln =
- lg.GetBinaryDirectory() + "/" + lg.GetProjectName() + ".sln";
+ cmStrCat(lg.GetBinaryDirectory(), '/', lg.GetProjectName(), ".sln");
cmCustomCommandLines commandLines = cmMakeSingleCommandLine(
{ cmSystemTools::GetCMakeCommand(), argS, argB, "--check-stamp-list",
stampList, "--vs-solution-file", sln });
@@ -364,7 +364,7 @@ bool cmGlobalVisualStudio8Generator::AddCheckTarget()
lg.AddCustomCommandToOutput(std::move(cc), true)) {
gt->AddSource(file->ResolveFullPath());
} else {
- cmSystemTools::Error("Error adding rule for " + stamps[0]);
+ cmSystemTools::Error(cmStrCat("Error adding rule for ", stamps[0]));
}
}
@@ -392,8 +392,8 @@ void cmGlobalVisualStudio8Generator::WriteSolutionConfigurations(
{
fout << "\tGlobalSection(SolutionConfigurationPlatforms) = preSolution\n";
for (std::string const& i : configs) {
- fout << "\t\t" << i << "|" << this->GetPlatformName() << " = " << i << "|"
- << this->GetPlatformName() << "\n";
+ fout << "\t\t" << i << '|' << this->GetPlatformName() << " = " << i << '|'
+ << this->GetPlatformName() << '\n';
}
fout << "\tEndGlobalSection\n";
}
@@ -409,33 +409,33 @@ void cmGlobalVisualStudio8Generator::WriteProjectConfigurations(
cmList mapConfig;
const char* dstConfig = i.c_str();
if (target.GetProperty("EXTERNAL_MSPROJECT")) {
- if (cmValue m = target.GetProperty("MAP_IMPORTED_CONFIG_" +
- cmSystemTools::UpperCase(i))) {
+ if (cmValue m = target.GetProperty(
+ cmStrCat("MAP_IMPORTED_CONFIG_", cmSystemTools::UpperCase(i)))) {
mapConfig.assign(*m);
if (!mapConfig.empty()) {
dstConfig = mapConfig[0].c_str();
}
}
}
- fout << "\t\t{" << guid << "}." << i << "|" << this->GetPlatformName()
- << ".ActiveCfg = " << dstConfig << "|"
+ fout << "\t\t{" << guid << "}." << i << '|' << this->GetPlatformName()
+ << ".ActiveCfg = " << dstConfig << '|'
<< (!platformMapping.empty() ? platformMapping
: this->GetPlatformName())
- << "\n";
+ << '\n';
auto ci = configsPartOfDefaultBuild.find(i);
if (!(ci == configsPartOfDefaultBuild.end())) {
- fout << "\t\t{" << guid << "}." << i << "|" << this->GetPlatformName()
- << ".Build.0 = " << dstConfig << "|"
+ fout << "\t\t{" << guid << "}." << i << '|' << this->GetPlatformName()
+ << ".Build.0 = " << dstConfig << '|'
<< (!platformMapping.empty() ? platformMapping
: this->GetPlatformName())
- << "\n";
+ << '\n';
}
if (this->NeedsDeploy(target, dstConfig)) {
- fout << "\t\t{" << guid << "}." << i << "|" << this->GetPlatformName()
- << ".Deploy.0 = " << dstConfig << "|"
+ fout << "\t\t{" << guid << "}." << i << '|' << this->GetPlatformName()
+ << ".Deploy.0 = " << dstConfig << '|'
<< (!platformMapping.empty() ? platformMapping
: this->GetPlatformName())
- << "\n";
+ << '\n';
}
}
}