[Cmake-commits] CMake branch, next, updated. v2.8.5-1730-g30098af

[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  30098af31a2b094c1cf86ed698a7c111ce93abec (commit)
       via  7bf2c1aa3ecd4921a19391cd9b37d78045a6e65d (commit)
      from  b16bf80fd6de886ca51261b45649f1615304cf77 (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=30098af31a2b094c1cf86ed698a7c111ce93abec
commit 30098af31a2b094c1cf86ed698a7c111ce93abec
Merge: b16bf80 7bf2c1a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 25 16:37:39 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 25 16:37:39 2011 -0400

    Merge topic 'AutomocForQt' into next
    
    7bf2c1a Create moc files in the current binary dir, not the top level.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7bf2c1aa3ecd4921a19391cd9b37d78045a6e65d
commit 7bf2c1aa3ecd4921a19391cd9b37d78045a6e65d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 25 21:39:51 2011 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 25 21:39:51 2011 +0200

    Create moc files in the current binary dir, not the top level.

diff --git a/Source/cmQtAutomoc.cxx b/Source/cmQtAutomoc.cxx
index ff96e5b..abda47e 100644
--- a/Source/cmQtAutomoc.cxx
+++ b/Source/cmQtAutomoc.cxx
@@ -207,7 +207,7 @@ bool cmQtAutomoc::ReadAutomocInfoFile(cmMakefile* makefile,
   this->IncludeProjectDirsBefore = makefile->IsOn(
                                 "AM_CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE");
   this->Srcdir = makefile->GetSafeDefinition("AM_CMAKE_CURRENT_SOURCE_DIR");
-  this->Builddir = makefile->GetSafeDefinition("AM_CMAKE_BINARY_DIR");
+  this->Builddir = makefile->GetSafeDefinition("AM_CMAKE_CURRENT_BINARY_DIR");
   this->MocExecutable = makefile->GetSafeDefinition("AM_QT_MOC_EXECUTABLE");
   this->MocCompileDefinitionsStr = makefile->GetSafeDefinition(
                                                  "AM_MOC_COMPILE_DEFINITIONS");

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

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


hooks/post-receive
-- 
CMake