diff options
| author | Brad King <brad.king@kitware.com> | 2018-08-27 18:04:14 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-08-27 18:04:22 (GMT) |
| commit | ce153cacc7010344afbe809973e5129d667ce289 (patch) | |
| tree | 74448b664db923734b75f889ffdffc32693ef14b /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 4a1b18db55935ab0a1a960fcea51247f1c5b4551 (diff) | |
| parent | 974de0e19932d27576a5c7661905f75b2b8daaa9 (diff) | |
| download | CMake-ce153cacc7010344afbe809973e5129d667ce289.zip CMake-ce153cacc7010344afbe809973e5129d667ce289.tar.gz CMake-ce153cacc7010344afbe809973e5129d667ce289.tar.bz2 | |
Merge topic 'static-lib-options'
974de0e199 static library: add property STATIC_LIBRARY_OPTIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2290
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 4e15354..4597bc6 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -3065,9 +3065,14 @@ void cmVisualStudio10TargetGenerator::WriteLibOptions( this->GeneratorTarget->GetType() != cmStateEnums::OBJECT_LIBRARY) { return; } + + const std::string& linkLanguage = + this->GeneratorTarget->GetLinkClosure(config)->LinkerLanguage; + std::string libflags; this->LocalGenerator->GetStaticLibraryFlags( - libflags, cmSystemTools::UpperCase(config), this->GeneratorTarget); + libflags, cmSystemTools::UpperCase(config), linkLanguage, + this->GeneratorTarget); if (!libflags.empty()) { Elem e2(e1, "Lib"); cmGlobalVisualStudio10Generator* gg = this->GlobalGenerator; |