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/cmLocalVisualStudio7Generator.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/cmLocalVisualStudio7Generator.cxx')
| -rw-r--r-- | Source/cmLocalVisualStudio7Generator.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/cmLocalVisualStudio7Generator.cxx b/Source/cmLocalVisualStudio7Generator.cxx index f009657..7ca3f8c 100644 --- a/Source/cmLocalVisualStudio7Generator.cxx +++ b/Source/cmLocalVisualStudio7Generator.cxx @@ -656,8 +656,7 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(std::ostream& fout, std::string flags; if(strcmp(configType, "10") != 0) { - const char* linkLanguage = - target.GetLinkerLanguage(this->GetGlobalGenerator()); + const char* linkLanguage = target.GetLinkerLanguage(); if(!linkLanguage) { cmSystemTools::Error @@ -1363,8 +1362,7 @@ cmLocalVisualStudio7GeneratorFCInfo lg->GlobalGenerator->GetLanguageFromExtension (sf.GetExtension().c_str()); const char* sourceLang = lg->GetSourceFileLanguage(sf); - const char* linkLanguage = target.GetLinkerLanguage - (lg->GetGlobalGenerator()); + const char* linkLanguage = target.GetLinkerLanguage(); bool needForceLang = false; // source file does not match its extension language if(lang && sourceLang && strcmp(lang, sourceLang) != 0) |