[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1412-g25de46e

[Stephen Kelly]

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  25de46e80a8eca5394cda81e966ae6bdaf225115 (commit)
       via  0ff680be130ba4b833e96829ada8952230cff777 (commit)
      from  148fbaea4cda177a90c2ceb497b2e4295cfdf66a (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=25de46e80a8eca5394cda81e966ae6bdaf225115
commit 25de46e80a8eca5394cda81e966ae6bdaf225115
Merge: 148fbae 0ff680b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 24 07:13:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 24 07:13:58 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    0ff680be Try harder to avoid duplicate object files with VS60.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0ff680be130ba4b833e96829ada8952230cff777
commit 0ff680be130ba4b833e96829ada8952230cff777
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Mon Mar 24 12:13:14 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Mon Mar 24 12:13:14 2014 +0100

    Try harder to avoid duplicate object files with VS60.

diff --git a/Source/cmLocalVisualStudio6Generator.cxx b/Source/cmLocalVisualStudio6Generator.cxx
index adc1975..11e9679 100644
--- a/Source/cmLocalVisualStudio6Generator.cxx
+++ b/Source/cmLocalVisualStudio6Generator.cxx
@@ -403,6 +403,11 @@ void cmLocalVisualStudio6Generator
   for(std::vector<const cmSourceFile *>::const_iterator sf =
         sourceFiles.begin(); sf != sourceFiles.end(); ++sf)
     {
+    if (!(*sf)->GetObjectLibrary().empty())
+      {
+      continue;
+      }
+
     std::string source = (*sf)->GetFullPath();
     const cmCustomCommand *command =
       (*sf)->GetCustomCommand();

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

Summary of changes:
 Source/cmLocalVisualStudio6Generator.cxx |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake