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/cmMakefileLibraryTargetGenerator.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/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 8752702..00935b8 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -109,8 +109,7 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles() //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules() { - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -132,8 +131,7 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) this->WriteFrameworkRules(relink); return; } - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -178,8 +176,7 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink) { - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -204,8 +201,7 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink) //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink) { - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -351,8 +347,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules } // Get the language to use for linking this library. - const char* linkLanguage = - this->Target->GetLinkerLanguage(this->GlobalGenerator); + const char* linkLanguage = this->Target->GetLinkerLanguage(); // Make sure we have a link language. if(!linkLanguage) |