diff options
| author | Brad King <brad.king@kitware.com> | 2017-04-12 17:17:31 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-04-17 14:54:00 (GMT) |
| commit | 3ab4681efa6db7339af36218fffea165ad1186f3 (patch) | |
| tree | 5a6cf7eb9a705455953aaf36ce88ddecfc97dc73 | |
| parent | be2c45f2a98d69cc9952b592777bb506f69149a2 (diff) | |
| download | CMake-3ab4681efa6db7339af36218fffea165ad1186f3.zip CMake-3ab4681efa6db7339af36218fffea165ad1186f3.tar.gz CMake-3ab4681efa6db7339af36218fffea165ad1186f3.tar.bz2 | |
cmGeneratorTarget: Drop default GetLinkerLanguage config argument
Update one remaining call site to avoid using the default.
| -rw-r--r-- | Source/cmGeneratorTarget.h | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGeneratorTarget.h b/Source/cmGeneratorTarget.h index d4f48fe..2ea2f2f 100644 --- a/Source/cmGeneratorTarget.h +++ b/Source/cmGeneratorTarget.h @@ -534,7 +534,7 @@ public: std::string GetPDBDirectory(const std::string& config) const; ///! Return the preferred linker language for this target - std::string GetLinkerLanguage(const std::string& config = "") const; + std::string GetLinkerLanguage(const std::string& config) const; /** Does this target have a GNU implib to convert to MS format? */ bool HasImplibGNUtoMS() const; diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index fbfc1ed..f0f04a8 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1881,7 +1881,8 @@ bool cmVisualStudio10TargetGenerator::OutputSourceSpecificFlags( std::string lang = this->GlobalGenerator->GetLanguageFromExtension(sf.GetExtension().c_str()); std::string sourceLang = this->LocalGenerator->GetSourceFileLanguage(sf); - const std::string& linkLanguage = this->GeneratorTarget->GetLinkerLanguage(); + const std::string& linkLanguage = + this->GeneratorTarget->GetLinkerLanguage(""); bool needForceLang = false; // source file does not match its extension language if (lang != sourceLang) { |