diff options
| author | David Cole <david.cole@kitware.com> | 2011-09-01 19:11:55 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2011-09-01 19:11:55 (GMT) |
| commit | 319df3245e774d807b993ff2fff3957e219ffe7b (patch) | |
| tree | a3b31b6f7814d6b349dc57c57cb3004a31cd0bf4 /Source | |
| parent | 89f420abdefd387ec600e958f4aef15295b9daa4 (diff) | |
| parent | 7bf2c1aa3ecd4921a19391cd9b37d78045a6e65d (diff) | |
| download | CMake-319df3245e774d807b993ff2fff3957e219ffe7b.zip CMake-319df3245e774d807b993ff2fff3957e219ffe7b.tar.gz CMake-319df3245e774d807b993ff2fff3957e219ffe7b.tar.bz2 | |
Merge topic 'AutomocForQt'
7bf2c1a Create moc files in the current binary dir, not the top level.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmQtAutomoc.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |