diff options
| author | Alex Neundorf <neundorf@kde.org> | 2012-09-24 20:06:20 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2012-09-30 14:27:44 (GMT) |
| commit | 80112da54e1aa8e64f73a2a5a6a4f73431ac6764 (patch) | |
| tree | ab12483eed9e9950336b4dc511418fd1423d74d1 /Source/cmGlobalGenerator.h | |
| parent | 955b96629e05bf2ddb6c94fa7a130e2b5b744782 (diff) | |
| parent | e83cc94dcd250e90143450bc916353b449043081 (diff) | |
| download | CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.zip CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.gz CMake-80112da54e1aa8e64f73a2a5a6a4f73431ac6764.tar.bz2 | |
Merge topic 'AutomocUseTargetProperties' into export-sets
Conflicts:
Source/cmGlobalGenerator.h
Diffstat (limited to 'Source/cmGlobalGenerator.h')
| -rw-r--r-- | Source/cmGlobalGenerator.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 71c3a4d..0aab2d6 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -19,6 +19,8 @@ #include "cmTargetDepend.h" // For cmTargetDependSet #include "cmSystemTools.h" // for cmSystemTools::OutputOption #include "cmExportSetMap.h" // For cmExportSetMap +#include "cmGeneratorTarget.h" + class cmake; class cmGeneratorTarget; class cmMakefile; @@ -372,8 +374,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; |