[Cmake-commits] CMake branch, next, updated. v3.2.2-3152-g1a8adc5

[Brad King]

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  1a8adc58f0654430a5a3851d14da6578fa9cfd25 (commit)
       via  2367aed971817eea25a4a165047145fa76a1c3d8 (commit)
      from  17e19fd8102b1b37f8dd15be5b4bf089f8ce75d3 (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=1a8adc58f0654430a5a3851d14da6578fa9cfd25
commit 1a8adc58f0654430a5a3851d14da6578fa9cfd25
Merge: 17e19fd 2367aed
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 09:52:56 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 26 09:52:56 2015 -0400

    Merge topic 'inject-state-snapshot' into next
    
    2367aed9 fixup! cmGlobalGenerator: Require a cmake instance in ctor.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2367aed971817eea25a4a165047145fa76a1c3d8
commit 2367aed971817eea25a4a165047145fa76a1c3d8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue May 26 09:47:24 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue May 26 09:47:24 2015 -0400

    fixup! cmGlobalGenerator: Require a cmake instance in ctor.

diff --git a/Source/cmcmd.cxx b/Source/cmcmd.cxx
index 463661b..3ea2186 100644
--- a/Source/cmcmd.cxx
+++ b/Source/cmcmd.cxx
@@ -727,6 +727,7 @@ int cmcmd::ExecuteCMakeCommand(std::vector<std::string>& args)
       cm.SetHomeOutputDirectory(homeOutDir);
       if(cmGlobalGenerator* ggd = cm.CreateGlobalGenerator(gen))
         {
+        cm.SetGlobalGenerator(ggd);
         cmsys::auto_ptr<cmLocalGenerator> lgd(ggd->MakeLocalGenerator());
         lgd->GetMakefile()->SetCurrentSourceDirectory(startDir);
         lgd->GetMakefile()->SetCurrentBinaryDirectory(startOutDir);

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

Summary of changes:
 Source/cmcmd.cxx |    1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
CMake