diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-18 14:12:34 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-11-18 14:12:34 (GMT) |
| commit | d526ebc603b0a83a7a1602ed4ddcf1b483077cf4 (patch) | |
| tree | 0ab06841f6ee3b6caccd65b8c2c43b697c7daed4 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 7a39d32f05ecb77227d304e5fe055cccbabd2739 (diff) | |
| parent | 689cd0d43ee1a09006f859df9d3eaf0ec0f8d430 (diff) | |
| download | CMake-d526ebc603b0a83a7a1602ed4ddcf1b483077cf4.zip CMake-d526ebc603b0a83a7a1602ed4ddcf1b483077cf4.tar.gz CMake-d526ebc603b0a83a7a1602ed4ddcf1b483077cf4.tar.bz2 | |
Merge topic 'vs-check-phone-store-tools'
689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228)
b20a32ac VS: Improve error messages when compiler is not detected (#15228)
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 2b5d162..f591fc8 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -2036,7 +2036,8 @@ WriteMasmOptions(std::string const& configName, void cmVisualStudio10TargetGenerator::WriteLibOptions(std::string const& config) { - if(this->Target->GetType() != cmTarget::STATIC_LIBRARY) + if(this->Target->GetType() != cmTarget::STATIC_LIBRARY && + this->Target->GetType() != cmTarget::OBJECT_LIBRARY) { return; } |