diff options
| author | Brad King <brad.king@kitware.com> | 2009-07-08 17:04:04 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2009-07-08 17:04:04 (GMT) |
| commit | 173448d9886deccb7cadd4fd0ffeaa236fa66e49 (patch) | |
| tree | 12ef68b6607c5b223cd5e962d2e63d3ba8e68b69 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | a3a046643aeb6244ac71a3cd645239099c6345f3 (diff) | |
| download | CMake-173448d9886deccb7cadd4fd0ffeaa236fa66e49.zip CMake-173448d9886deccb7cadd4fd0ffeaa236fa66e49.tar.gz CMake-173448d9886deccb7cadd4fd0ffeaa236fa66e49.tar.bz2 | |
ENH: Pass config to cmTarget::GetLinkerLanguage
This passes the build configuration to most GetLinkerLanguage calls. In
the future the linker language will account for targets linked in each
configuration.
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileLibraryTargetGenerator.cxx | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx b/Source/cmMakefileLibraryTargetGenerator.cxx index 9c92824..9a5f7fd 100644 --- a/Source/cmMakefileLibraryTargetGenerator.cxx +++ b/Source/cmMakefileLibraryTargetGenerator.cxx @@ -109,7 +109,8 @@ void cmMakefileLibraryTargetGenerator::WriteRuleFiles() //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteStaticLibraryRules() { - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(this->ConfigName); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -131,7 +132,8 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) this->WriteFrameworkRules(relink); return; } - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(this->ConfigName); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -176,7 +178,8 @@ void cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink) //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink) { - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(this->ConfigName); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -201,7 +204,8 @@ void cmMakefileLibraryTargetGenerator::WriteModuleLibraryRules(bool relink) //---------------------------------------------------------------------------- void cmMakefileLibraryTargetGenerator::WriteFrameworkRules(bool relink) { - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(this->ConfigName); std::string linkRuleVar = "CMAKE_"; if (linkLanguage) { @@ -347,7 +351,8 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules } // Get the language to use for linking this library. - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(this->ConfigName); // Make sure we have a link language. if(!linkLanguage) |