[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1447-g1087555

[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  10875553da2862eec0bc56d6c302eb7d14e69e51 (commit)
       via  be5a9bd8decb82134c090727a2005427bcf2b2a1 (commit)
      from  21061f26437047b8eaf3ad218d8a921f2e4e1a0f (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=10875553da2862eec0bc56d6c302eb7d14e69e51
commit 10875553da2862eec0bc56d6c302eb7d14e69e51
Merge: 21061f2 be5a9bd
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 26 10:59:10 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 26 10:59:10 2014 -0400

    Merge topic 'target-sources-refactor' into next
    
    be5a9bd8 Fixup previous commit.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be5a9bd8decb82134c090727a2005427bcf2b2a1
commit be5a9bd8decb82134c090727a2005427bcf2b2a1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Mar 26 15:57:53 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Mar 26 15:57:53 2014 +0100

    Fixup previous commit.

diff --git a/Source/cmComputeTargetDepends.cxx b/Source/cmComputeTargetDepends.cxx
index 723988b..db8b7f3 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -223,7 +223,7 @@ void cmComputeTargetDepends::CollectTargetDepends(int depender_index)
       it = objectFiles.begin(); it != objectFiles.end(); ++it)
     {
     std::string objLib = (*it)->GetObjectLibrary();
-    if (emitted.insert(objLib).second)
+    if (!objLib.empty() && emitted.insert(objLib).second)
       {
       if(depender->GetType() != cmTarget::EXECUTABLE &&
           depender->GetType() != cmTarget::STATIC_LIBRARY &&

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

Summary of changes:
 Source/cmComputeTargetDepends.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake