[Cmake-commits] CMake branch, next, updated. v3.3.1-2623-gf07317c

[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  f07317cab18e849592c87e5c5839a40c10ca1ebb (commit)
       via  e5359b73955e09a9269b7d4c49f95d08f9432b69 (commit)
      from  9d22e557598eea0ccae4442d6d43b58c724219ae (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=f07317cab18e849592c87e5c5839a40c10ca1ebb
commit f07317cab18e849592c87e5c5839a40c10ca1ebb
Merge: 9d22e55 e5359b7
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 12:42:19 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Aug 29 12:42:19 2015 -0400

    Merge topic 'refactor-compute' into next
    
    e5359b73 Revert "cmGlobalGenerator: Move path computation to Compute.:"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5359b73955e09a9269b7d4c49f95d08f9432b69
commit e5359b73955e09a9269b7d4c49f95d08f9432b69
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Aug 29 18:41:57 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Aug 29 18:41:57 2015 +0200

    Revert "cmGlobalGenerator: Move path computation to Compute.:"
    
    This reverts commit b3d2df0cb3733f8b4bebc970df89bed2724f321a.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 2ccfc26..a440de2 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1329,11 +1329,6 @@ bool cmGlobalGenerator::Compute()
     return false;
     }
 
-  for (i = 0; i < this->LocalGenerators.size(); ++i)
-    {
-    this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
-    }
-
   return true;
 }
 
@@ -1345,8 +1340,13 @@ void cmGlobalGenerator::Generate()
 
   this->ProcessEvaluationFiles();
 
+  for (i = 0; i < this->LocalGenerators.size(); ++i)
+    {
+    this->LocalGenerators[i]->ComputeHomeRelativeOutputPath();
+    }
+
   // Generate project files
-  for (unsigned int i = 0; i < this->LocalGenerators.size(); ++i)
+  for (i = 0; i < this->LocalGenerators.size(); ++i)
     {
     this->SetCurrentMakefile(this->LocalGenerators[i]->GetMakefile());
     this->LocalGenerators[i]->Generate();

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

Summary of changes:
 Source/cmGlobalGenerator.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake