[Cmake-commits] CMake branch, next, updated. v3.3.1-2629-g0e79b98

[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  0e79b982a0066b31aa19fe942827d7967a51571f (commit)
       via  34a9e968aff1c1c27ec49776e1dd54c0e59478da (commit)
      from  f90a2971aa49543f0d74a555abea1d0252205dc9 (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=0e79b982a0066b31aa19fe942827d7967a51571f
commit 0e79b982a0066b31aa19fe942827d7967a51571f
Merge: f90a297 34a9e96
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 30 05:39:36 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Aug 30 05:39:36 2015 -0400

    Merge topic 'refactor-compute' into next
    
    34a9e968 Revert "cmGlobalGenerator: Do more computation at compute time."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34a9e968aff1c1c27ec49776e1dd54c0e59478da
commit 34a9e968aff1c1c27ec49776e1dd54c0e59478da
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Aug 30 11:39:09 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Aug 30 11:39:09 2015 +0200

    Revert "cmGlobalGenerator: Do more computation at compute time."
    
    This reverts commit 821468acc73560aabb6fa9904db511b5d992450e.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index e6bf5eb..a2885c0 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1308,6 +1308,13 @@ 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)
@@ -1326,16 +1333,9 @@ bool cmGlobalGenerator::Compute()
   // Compute the inter-target dependencies.
   if(!this->ComputeTargetDepends())
     {
-    return false;
+    return;
     }
 
-  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:
 Source/cmGlobalGenerator.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake