summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Goshi <jgoshi@microsoft.com>2019-09-03 17:25:44 (GMT)
committerBrad King <brad.king@kitware.com>2019-09-09 13:43:34 (GMT)
commiteac8700c7853d88f0682492ccefc70b4246ccf4a (patch)
treed0e14520a1ce80e24ecf7300eceb93a45e4867b8
parent922482dd3acd2af9d26476134b3386c5a7695a03 (diff)
downloadCMake-eac8700c7853d88f0682492ccefc70b4246ccf4a.zip
CMake-eac8700c7853d88f0682492ccefc70b4246ccf4a.tar.gz
CMake-eac8700c7853d88f0682492ccefc70b4246ccf4a.tar.bz2
cmLocalGenerator: Improve local variable names
-rw-r--r--Source/cmLocalGenerator.cxx24
1 files changed, 12 insertions, 12 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 25e4d01..361b005 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -852,10 +852,10 @@ void cmLocalGenerator::AddCompileOptions(std::string& flags,
// COMPILE_FLAGS are not escaped for historical reasons.
this->AppendFlags(flags, targetFlags);
}
- std::vector<std::string> opts;
- target->GetCompileOptions(opts, config, lang);
+ std::vector<std::string> targetCompileOpts;
+ target->GetCompileOptions(targetCompileOpts, config, lang);
// COMPILE_OPTIONS are escaped.
- this->AppendCompileOptions(flags, opts);
+ this->AppendCompileOptions(flags, targetCompileOpts);
}
for (auto const& it : target->GetMaxLanguageStandards()) {
@@ -1132,10 +1132,10 @@ void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
this->AppendFlags(flags, target->GetSafeProperty(name));
}
- std::vector<std::string> options;
- target->GetStaticLibraryLinkOptions(options, config, linkLanguage);
+ std::vector<std::string> staticLibOpts;
+ target->GetStaticLibraryLinkOptions(staticLibOpts, config, linkLanguage);
// STATIC_LIBRARY_OPTIONS are escaped.
- this->AppendCompileOptions(flags, options);
+ this->AppendCompileOptions(flags, staticLibOpts);
}
void cmLocalGenerator::GetTargetFlags(
@@ -1205,10 +1205,10 @@ void cmLocalGenerator::GetTargetFlags(
}
}
- std::vector<std::string> opts;
- target->GetLinkOptions(opts, config, linkLanguage);
+ std::vector<std::string> linkOpts;
+ target->GetLinkOptions(linkOpts, config, linkLanguage);
// LINK_OPTIONS are escaped.
- this->AppendCompileOptions(linkFlags, opts);
+ this->AppendCompileOptions(linkFlags, linkOpts);
if (pcli) {
this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs,
frameworkPath, linkPath);
@@ -1282,10 +1282,10 @@ void cmLocalGenerator::GetTargetFlags(
}
}
- std::vector<std::string> opts;
- target->GetLinkOptions(opts, config, linkLanguage);
+ std::vector<std::string> linkOpts;
+ target->GetLinkOptions(linkOpts, config, linkLanguage);
// LINK_OPTIONS are escaped.
- this->AppendCompileOptions(linkFlags, opts);
+ this->AppendCompileOptions(linkFlags, linkOpts);
} break;
default:
break;