diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-17 20:39:17 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-17 20:39:17 (GMT) |
| commit | bea609ac2a3101cf6e18bc1cd5d752a190d89ccc (patch) | |
| tree | 118dc94f16db8a6f31bc56d7b9c1fffbdaad08e2 /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | 536baafb7619542e8b7f08a5422c7930627a6b12 (diff) | |
| parent | 689cd0d43ee1a09006f859df9d3eaf0ec0f8d430 (diff) | |
| download | CMake-bea609ac2a3101cf6e18bc1cd5d752a190d89ccc.zip CMake-bea609ac2a3101cf6e18bc1cd5d752a190d89ccc.tar.gz CMake-bea609ac2a3101cf6e18bc1cd5d752a190d89ccc.tar.bz2 | |
Merge branch 'vs-check-phone-store-tools' into release
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 8109b16..1ac13cf 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; } |