[Cmake-commits] CMake branch, next, updated. v3.3.1-2627-gf90a297

[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  f90a2971aa49543f0d74a555abea1d0252205dc9 (commit)
       via  821468acc73560aabb6fa9904db511b5d992450e (commit)
      from  b29ffb2a677590cafe21cc6e5dc2d14b00428108 (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=f90a2971aa49543f0d74a555abea1d0252205dc9
commit f90a2971aa49543f0d74a555abea1d0252205dc9
Merge: b29ffb2 821468a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 12:56:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 29 12:56:19 2015 -0400

    Merge topic 'refactor-compute' into next
    
    821468ac cmGlobalGenerator: Do more computation at compute time.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=821468acc73560aabb6fa9904db511b5d992450e
commit 821468acc73560aabb6fa9904db511b5d992450e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 09:21:32 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 18:55:54 2015 +0200

    cmGlobalGenerator: Do more computation at compute time.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index a2885c0..e6bf5eb 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1308,13 +1308,6 @@ bool cmGlobalGenerator::Compute()
       }
     }
 
-  return true;
-}
-
-void cmGlobalGenerator::Generate()
-{
-  unsigned int i;
-
   // Trace the dependencies, after that no custom commands should be added
   // because their dependencies might not be handled correctly
   for (i = 0; i < this->LocalGenerators.size(); ++i)
@@ -1333,9 +1326,16 @@ void cmGlobalGenerator::Generate()
   // Compute the inter-target dependencies.
   if(!this->ComputeTargetDepends())
     {
-    return;
+    return false;
     }
 
+  return true;
+}
+
+void cmGlobalGenerator::Generate()
+{
+  unsigned int i;
+
   // Create a map from local generator to the complete set of targets
   // it builds by default.
   this->InitializeProgressMarks();

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

Summary of changes:


hooks/post-receive
-- 
CMake