[Cmake-commits] CMake branch, next, updated. v3.1.0-rc1-577-ge14e822

[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  e14e822cf2500a9b592279c4a564eff6390787f4 (commit)
       via  b08923ae4bb0cb8785f379b8684a292e6c9c0b5a (commit)
      from  b8f5b4bc95f5c553aa4928daa61260203c822aac (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=e14e822cf2500a9b592279c4a564eff6390787f4
commit e14e822cf2500a9b592279c4a564eff6390787f4
Merge: b8f5b4b b08923a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 16:33:42 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 12 16:33:42 2014 -0500

    Merge topic 'file-GENERATE-source' into next
    
    b08923ae fixup! file(GENERATE): Evaluate early to allow generating source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b08923ae4bb0cb8785f379b8684a292e6c9c0b5a
commit b08923ae4bb0cb8785f379b8684a292e6c9c0b5a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 12 22:32:58 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Nov 12 22:32:58 2014 +0100

    fixup! file(GENERATE): Evaluate early to allow generating source files

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ecef611..26cfdbe 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1253,8 +1253,6 @@ void cmGlobalGenerator::Generate()
   // Create per-target generator information.
   this->CreateGeneratorTargets();
 
-  this->ForceLinkerLanguages();
-
 #ifdef CMAKE_BUILD_WITH_CMAKE
   for (AutogensType::iterator it = autogens.begin(); it != autogens.end();
        ++it)
@@ -1270,6 +1268,8 @@ void cmGlobalGenerator::Generate()
     this->LocalGenerators[i]->TraceDependencies();
     }
 
+  this->ForceLinkerLanguages();
+
   // Compute the manifest of main targets generated.
   for (i = 0; i < this->LocalGenerators.size(); ++i)
     {

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

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


hooks/post-receive
-- 
CMake