[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2602-gadae531

[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  adae531816b8b3e78cc8fd92b6af278c1b8aea58 (commit)
       via  a21ebb9bfeb9d7152c8ca7e0ff45f29ba8ce14d6 (commit)
      from  94855ee1b25b58b703f9f6d76a4ad4e191e9887f (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=adae531816b8b3e78cc8fd92b6af278c1b8aea58
commit adae531816b8b3e78cc8fd92b6af278c1b8aea58
Merge: 94855ee a21ebb9
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 12 06:53:16 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 12 06:53:16 2013 -0400

    Merge topic 'config-dependent-CMAKE_AUTOMOC' into next
    
    a21ebb9 Add missing localGen.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a21ebb9bfeb9d7152c8ca7e0ff45f29ba8ce14d6
commit a21ebb9bfeb9d7152c8ca7e0ff45f29ba8ce14d6
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jun 12 12:52:24 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jun 12 12:52:24 2013 +0200

    Add missing localGen.

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index 1967e31..5de93fb 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -223,6 +223,7 @@ void cmQtAutomoc::SetupAutomocTarget(cmTarget* target)
 
 #if defined(_WIN32) && !defined(__CYGWIN__)
   bool usePRE_BUILD = false;
+  cmLocalGenerator* localGen = makefile->GetLocalGenerator();
   cmGlobalGenerator* gg = localGen->GetGlobalGenerator();
   if(strstr(gg->GetName(), "Visual Studio"))
     {

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

Summary of changes:
 Source/cmQtAutomoc.cxx |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake