From eac8700c7853d88f0682492ccefc70b4246ccf4a Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Tue, 3 Sep 2019 10:25:44 -0700 Subject: cmLocalGenerator: Improve local variable names --- Source/cmLocalGenerator.cxx | 24 ++++++++++++------------ 1 file 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 opts; - target->GetCompileOptions(opts, config, lang); + std::vector 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 options; - target->GetStaticLibraryLinkOptions(options, config, linkLanguage); + std::vector 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 opts; - target->GetLinkOptions(opts, config, linkLanguage); + std::vector 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 opts; - target->GetLinkOptions(opts, config, linkLanguage); + std::vector linkOpts; + target->GetLinkOptions(linkOpts, config, linkLanguage); // LINK_OPTIONS are escaped. - this->AppendCompileOptions(linkFlags, opts); + this->AppendCompileOptions(linkFlags, linkOpts); } break; default: break; -- cgit v0.12