diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-11-04 09:34:54 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-11-05 19:17:34 (GMT) |
| commit | 944277d09ebdf59f2ea32931516af568e897bcd5 (patch) | |
| tree | 8215b50c283421ef7f348e8366472a5ffce9da45 /Source/cmGlobalGenerator.h | |
| parent | d2f4b1e3cf934eab02282ee312408601d6756a31 (diff) | |
| download | CMake-944277d09ebdf59f2ea32931516af568e897bcd5.zip CMake-944277d09ebdf59f2ea32931516af568e897bcd5.tar.gz CMake-944277d09ebdf59f2ea32931516af568e897bcd5.tar.bz2 | |
cmAutogen: Gather tool arguments after creating generator targets.
This change causes the GetLinkInterfaceDependentStringProperty method,
called in SetupAutoGenerateTarget, after the creation of generator
targets. In CMake 4.0, the GetLinkInterfaceDependentStringProperty
will move to the cmGeneratorTarget class, and this patch is a necessary
prerequisite to that.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 92c3096..b9f4bd0 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -32,6 +32,7 @@ class cmTarget; class cmInstallTargetGenerator; class cmInstallFilesGenerator; class cmExportBuildFileGenerator; +class cmQtAutoGenerators; /** \class cmGlobalGenerator * \brief Responable for overseeing the generation process for the entire tree @@ -323,7 +324,8 @@ protected: virtual bool CheckALLOW_DUPLICATE_CUSTOM_TARGETS(); bool CheckTargets(); - void CreateQtAutoGeneratorsTargets(); + typedef std::vector<std::pair<cmQtAutoGenerators, cmTarget*> > AutogensType; + void CreateQtAutoGeneratorsTargets(AutogensType& autogens); // Fill the ProjectMap, this must be called after LocalGenerators |