[Cmake-commits] CMake branch, next, updated. v3.0.0-rc1-1077-gb0a5020

[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  b0a50207f80515ca648f5a112f958136fe05179c (commit)
       via  b780f71c321428ca49e4e648df2e0c3b8ce673e7 (commit)
      from  e7883b7e90a696a49743f5eff5873757ed45b065 (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=b0a50207f80515ca648f5a112f958136fe05179c
commit b0a50207f80515ca648f5a112f958136fe05179c
Merge: e7883b7 b780f71
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Mar 15 05:12:21 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Mar 15 05:12:21 2014 -0400

    Merge topic 'target-objects-refactor' into next
    
    b780f71c Early return.


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

    Early return.

diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index e7f5990..38f63cd 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -327,6 +327,10 @@ cmGeneratorTarget
 
 void cmGeneratorTarget::ComputeObjectMapping()
 {
+  if(!this->Objects.empty())
+    {
+    return;
+    }
   std::vector<cmSourceFile const*> sourceFiles;
   this->GetObjectSources(sourceFiles);
 }

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

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


hooks/post-receive
-- 
CMake