[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-656-gf77a1b1

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  f77a1b1f89fd74036cb98f1d0ba45e34d8c5f02f (commit)
       via  689cd0d43ee1a09006f859df9d3eaf0ec0f8d430 (commit)
      from  04fe52caa011df0276ada5eab6e169a65e103f79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f77a1b1f89fd74036cb98f1d0ba45e34d8c5f02f
commit f77a1b1f89fd74036cb98f1d0ba45e34d8c5f02f
Merge: 04fe52c 689cd0d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 17 08:58:28 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 17 08:58:28 2014 -0500

    Merge topic 'vs-check-phone-store-tools' into next
    
    689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=689cd0d43ee1a09006f859df9d3eaf0ec0f8d430
commit 689cd0d43ee1a09006f859df9d3eaf0ec0f8d430
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Sun Nov 16 14:24:58 2014 -0800
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 17 08:57:14 2014 -0500

    VS: Do not produce WinMD file for OBJECT libraries (#15228)
    
    They are implemented as static libraries for the IDE so treat them the
    same.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 26fc317..f9d5e00 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;
     }

-----------------------------------------------------------------------

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake