diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-07-25 21:19:36 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-07-27 19:58:49 (GMT) |
| commit | 496f4cd07d20e91750ec920e05a4aef4e4bdc9ba (patch) | |
| tree | 61ac013845aa592641661a2dca489e96b2ec2292 /Source/cmQtAutoGenerators.cxx | |
| parent | de80993a2020e64259f12f608d11d1ace9a719a6 (diff) | |
| download | CMake-496f4cd07d20e91750ec920e05a4aef4e4bdc9ba.zip CMake-496f4cd07d20e91750ec920e05a4aef4e4bdc9ba.tar.gz CMake-496f4cd07d20e91750ec920e05a4aef4e4bdc9ba.tar.bz2 | |
cmGlobalGenerator: Create cmGeneratorTargets before QtAutomoc.
Add cmGeneratorTargets as needed in the QtAutomoc processing.
Diffstat (limited to 'Source/cmQtAutoGenerators.cxx')
| -rw-r--r-- | Source/cmQtAutoGenerators.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx index 58f4bf4..ae21561 100644 --- a/Source/cmQtAutoGenerators.cxx +++ b/Source/cmQtAutoGenerators.cxx @@ -287,7 +287,8 @@ std::string cmQtAutoGenerators::ListQt4RccInputs(cmSourceFile* sf, return entriesList; } -bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target) +bool cmQtAutoGenerators::InitializeAutogenTarget(cmLocalGenerator* lg, + cmTarget* target) { cmMakefile* makefile = target->GetMakefile(); // don't do anything if there is no Qt4 or Qt5Core (which contains moc): @@ -474,6 +475,10 @@ bool cmQtAutoGenerators::InitializeAutogenTarget(cmTarget* target) /*byproducts=*/rcc_output, depends, commandLines, false, autogenComment.c_str()); + cmGeneratorTarget* gt = new cmGeneratorTarget(autogenTarget, lg); + lg->GetGlobalGenerator()->AddGeneratorTarget(autogenTarget, gt); + makefile->AddGeneratorTarget(autogenTarget, gt); + // Set target folder const char* autogenFolder = makefile->GetState() ->GetGlobalProperty("AUTOMOC_TARGETS_FOLDER"); |