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