diff options
| author | Stephen Kelly <steveire@gmail.com> | 2012-09-19 16:33:11 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2012-09-19 16:33:11 (GMT) |
| commit | 9d8e59db71833dce7133bac48e461e388223eb51 (patch) | |
| tree | ffe24aaf87035587dfb8b8f2d3c9edb0a7b1f42d /Source/cmGlobalGenerator.h | |
| parent | ea12871241e1a943be75e7c987f71f54ec3f3908 (diff) | |
| parent | 6674583caa20244d90aa14a67d059e7228a9f169 (diff) | |
| download | CMake-9d8e59db71833dce7133bac48e461e388223eb51.zip CMake-9d8e59db71833dce7133bac48e461e388223eb51.tar.gz CMake-9d8e59db71833dce7133bac48e461e388223eb51.tar.bz2 | |
Merge branch 'use-generator-target' into AutomocUseTargetProperties
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index ce91793..2f4ebc3 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -18,6 +18,7 @@ #include "cmTarget.h" // For cmTargets #include "cmTargetDepend.h" // For cmTargetDependSet #include "cmSystemTools.h" // for cmSystemTools::OutputOption +#include "cmGeneratorTarget.h" class cmake; class cmGeneratorTarget; class cmMakefile; @@ -383,8 +384,7 @@ private: TargetDependMap TargetDependencies; // Per-target generator information. - typedef std::map<cmTarget*, cmGeneratorTarget*> GeneratorTargetsType; - GeneratorTargetsType GeneratorTargets; + cmGeneratorTargetsType GeneratorTargets; void CreateGeneratorTargets(); void ClearGeneratorTargets(); virtual void ComputeTargetObjects(cmGeneratorTarget* gt) const; |