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/cmVisualStudio10TargetGenerator.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/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index bae892d..065f454 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -582,7 +582,8 @@ OutputLinkIncremental(std::string const& configName) // assume incremental linking const char* incremental = "true"; - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(configName.c_str()); if(!linkLanguage) { cmSystemTools::Error @@ -638,7 +639,8 @@ WriteClOptions(std::string const& configName, // collect up flags for if(this->Target->GetType() < cmTarget::UTILITY) { - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(configName.c_str()); if(!linkLanguage) { cmSystemTools::Error @@ -772,7 +774,8 @@ void cmVisualStudio10TargetGenerator::WriteLinkOptions(std::string const& { return; } - const char* linkLanguage = this->Target->GetLinkerLanguage(); + const char* linkLanguage = + this->Target->GetLinkerLanguage(config.c_str()); if(!linkLanguage) { cmSystemTools::Error |