diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2016-11-30 21:51:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-12-07 13:23:59 (GMT) |
| commit | 6f53b1ab642ca1e5977121ec60779f248cf8ee88 (patch) | |
| tree | c1c39311fbaaf7e7f7929764151413bf3dd4ee38 /Source/cmQtAutoGeneratorInitializer.cxx | |
| parent | 39e07d7a175d5da0c1a2ebc905689705571d2084 (diff) | |
| download | CMake-6f53b1ab642ca1e5977121ec60779f248cf8ee88.zip CMake-6f53b1ab642ca1e5977121ec60779f248cf8ee88.tar.gz CMake-6f53b1ab642ca1e5977121ec60779f248cf8ee88.tar.bz2 | |
QtAutogen: Generate moc compilation in _automoc.dir/moc_compilation.cpp
Diffstat (limited to 'Source/cmQtAutoGeneratorInitializer.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorInitializer.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Source/cmQtAutoGeneratorInitializer.cxx b/Source/cmQtAutoGeneratorInitializer.cxx index de70d34..a443934 100644 --- a/Source/cmQtAutoGeneratorInitializer.cxx +++ b/Source/cmQtAutoGeneratorInitializer.cxx @@ -650,14 +650,10 @@ static void RccSetupAutoTarget(cmGeneratorTarget const* target) void cmQtAutoGeneratorInitializer::InitializeAutogenSources( cmGeneratorTarget* target) { - cmMakefile* makefile = target->Target->GetMakefile(); - if (target->GetPropertyAsBool("AUTOMOC")) { - std::string automocTargetName = GetAutogenTargetName(target); - std::string mocCppFile = makefile->GetCurrentBinaryDirectory(); - mocCppFile += "/"; - mocCppFile += automocTargetName; - mocCppFile += ".cpp"; + cmMakefile* makefile = target->Target->GetMakefile(); + std::string mocCppFile = GetAutogenTargetBuildDir(target); + mocCppFile += "moc_compilation.cpp"; makefile->GetOrCreateSource(mocCppFile, true); makefile->AppendProperty("ADDITIONAL_MAKE_CLEAN_FILES", mocCppFile.c_str(), false); |