kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmGlobalXCodeGenerator: Rename variable 'lang' => 'llang'

Browse Source 
In CreateBuildSettings the variable holds the linker language.
Use a more distinctive variable name.
This commit is contained in:
Brad King 2015-02-06 10:31:08 -05:00
parent de63ff489d
commit d2fe4c4203
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmGlobalXCodeGenerator.cxx
View File

@ -1775,8 +1775,8 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
AddCompileOptions(flags, &target, lang, configName); AddCompileOptions(flags, &target, lang, configName);
} }
std::string lang = target.GetLinkerLanguage(configName); std::string llang = target.GetLinkerLanguage(configName);
if(binary && lang.empty()) if(binary && llang.empty())
{ {
cmSystemTools::Error cmSystemTools::Error
("CMake can not determine linker language for target: ", ("CMake can not determine linker language for target: ",
@ -2001,7 +2001,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
// in many ways as an application bundle, as far as // in many ways as an application bundle, as far as
// link flags go // link flags go
std::string createFlags = std::string createFlags =
this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", lang, "_FLAGS", this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", llang, "_FLAGS",
"-bundle"); "-bundle");
if(!createFlags.empty()) if(!createFlags.empty())
{ {
@ -2029,7 +2029,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
this->CreateString("NO")); this->CreateString("NO"));
// Add the flags to create an executable. // Add the flags to create an executable.
std::string createFlags = std::string createFlags =
this->LookupFlags("CMAKE_", lang, "_LINK_FLAGS", ""); this->LookupFlags("CMAKE_", llang, "_LINK_FLAGS", "");
if(!createFlags.empty()) if(!createFlags.empty())
{ {
extraLinkOptions += " "; extraLinkOptions += " ";
@ -2040,7 +2040,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
{ {
// Add the flags to create a module. // Add the flags to create a module.
std::string createFlags = std::string createFlags =
this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", lang, "_FLAGS", this->LookupFlags("CMAKE_SHARED_MODULE_CREATE_", llang, "_FLAGS",
"-bundle"); "-bundle");
if(!createFlags.empty()) if(!createFlags.empty())
{ {
@ -2074,7 +2074,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
{ {
// Add the flags to create a shared library. // Add the flags to create a shared library.
std::string createFlags = std::string createFlags =
this->LookupFlags("CMAKE_SHARED_LIBRARY_CREATE_", lang, "_FLAGS", this->LookupFlags("CMAKE_SHARED_LIBRARY_CREATE_", llang, "_FLAGS",
"-dynamiclib"); "-dynamiclib");
if(!createFlags.empty()) if(!createFlags.empty())
{ {
@ -2091,7 +2091,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
{ {
// Add the flags to create an executable. // Add the flags to create an executable.
std::string createFlags = std::string createFlags =
this->LookupFlags("CMAKE_", lang, "_LINK_FLAGS", ""); this->LookupFlags("CMAKE_", llang, "_LINK_FLAGS", "");
if(!createFlags.empty()) if(!createFlags.empty())
{ {
extraLinkOptions += " "; extraLinkOptions += " ";