[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6183-g3755dab

Stephen Kelly steveire at gmail.com
Wed Dec 11 08:22:50 EST 2013


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  3755dab985d601d18120c6d4d01e2062c027788c (commit)
       via  4e2a72b43775f60ce0c85b71109ea8b1213a8896 (commit)
      from  8cb8b3b62ad3072c00dac34559c3e1851b4a46ca (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=3755dab985d601d18120c6d4d01e2062c027788c
commit 3755dab985d601d18120c6d4d01e2062c027788c
Merge: 8cb8b3b 4e2a72b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 08:22:44 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 11 08:22:44 2013 -0500

    Merge topic 'minor-cleanup' into next
    
    4e2a72b Fix build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e2a72b43775f60ce0c85b71109ea8b1213a8896
commit 4e2a72b43775f60ce0c85b71109ea8b1213a8896
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Dec 11 14:21:02 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Dec 11 14:21:46 2013 +0100

    Fix build.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 5892105..0845120 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -261,7 +261,7 @@ void cmLocalGenerator::TraceDependencies()
   for(cmGeneratorTargetsType::iterator t = targets.begin();
       t != targets.end(); ++t)
     {
-    if (ti->second->Target->IsImported())
+    if (t->second->Target->IsImported())
       {
       continue;
       }
@@ -549,7 +549,7 @@ void cmLocalGenerator::GenerateTargetManifest()
       {
       continue;
       }
-    if (target->Target->IsImported())
+    if (target.Target->IsImported())
       {
       continue;
       }

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

Summary of changes:
 Source/cmLocalGenerator.cxx |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list