diff options
author | Brad King <brad.king@kitware.com> | 2009-07-07 11:44:12 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-07-07 11:44:12 (GMT) |
commit | a60846718048e33db01e7993ba7d6fa994e0c8b5 (patch) | |
tree | 6bac297b484b07daa28e5c320848a7d0ea0f2e03 /Source/cmVisualStudio10TargetGenerator.cxx | |
parent | 6ec20cc3f9cddcb7c817a29874bb0fb0c6ab509b (diff) | |
download | CMake-a60846718048e33db01e7993ba7d6fa994e0c8b5.zip CMake-a60846718048e33db01e7993ba7d6fa994e0c8b5.tar.gz CMake-a60846718048e33db01e7993ba7d6fa994e0c8b5.tar.bz2 |
ENH: Simpler cmTarget::GetLinkerLanguage signature
This method previously required the global generator to be passed, but
that was left from before cmTarget had its Makefile member. Now the
global generator can be retrieved automatically, so we can drop the
method argument.
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
-rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index cd96a75..bae892d 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -446,8 +446,7 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( this->GlobalGenerator->GetLanguageFromExtension (sf.GetExtension().c_str()); const char* sourceLang = this->LocalGenerator->GetSourceFileLanguage(sf); - const char* linkLanguage = this->Target->GetLinkerLanguage - (this->LocalGenerator->GetGlobalGenerator()); + const char* linkLanguage = this->Target->GetLinkerLanguage(); bool needForceLang = false; // source file does not match its extension language if(lang && sourceLang && strcmp(lang, sourceLang) != 0) @@ -583,8 +582,7 @@ OutputLinkIncremental(std::string const& configName) // assume incremental linking const char* incremental = "true"; - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); if(!linkLanguage) { cmSystemTools::Error @@ -640,8 +638,7 @@ WriteClOptions(std::string const& configName, // collect up flags for if(this->Target->GetType() < cmTarget::UTILITY) { - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); if(!linkLanguage) { cmSystemTools::Error @@ -775,8 +772,7 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& { return; } - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); if(!linkLanguage) { cmSystemTools::Error |