summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-10-21 13:16:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2015-10-21 13:16:56 (GMT)
commit740f85a204d7a837e3ad408a79992f6a9c0b000c (patch)
tree55e55d20f5f8777e5c1e860e3a0d476a40d26255 /Source/cmGlobalGenerator.cxx
parent8bcf2c81fc2a2bc458d54f9d5dbd40b49e5b993e (diff)
parenta4bbdc5ecf4d2b66346e1006cee891acf95c8ad8 (diff)
downloadCMake-740f85a204d7a837e3ad408a79992f6a9c0b000c.zip
CMake-740f85a204d7a837e3ad408a79992f6a9c0b000c.tar.gz
CMake-740f85a204d7a837e3ad408a79992f6a9c0b000c.tar.bz2
Merge topic 'cmLocalGenerator-generator-target-storage'
a4bbdc5e cmLocalGenerator: Remove cmGeneratorTargetsType from setter API. 04b6bb16 cmLocalGenerator: Simplify semantic of adding generator targets. 400e3d19 cmLocalGenerator: Don't store imported generator targets 726e461b CMP0063: Split unit test by target type.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx5
1 files changed, 1 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 1142ddd..a55365f 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1574,7 +1574,6 @@ void cmGlobalGenerator::FinalizeTargetCompileInfo()
void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
cmLocalGenerator *lg)
{
- cmGeneratorTargetsType generatorTargets;
cmMakefile* mf = lg->GetMakefile();
if (targetTypes == AllTargets)
{
@@ -1585,7 +1584,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
cmTarget* t = &ti->second;
cmGeneratorTarget* gt = new cmGeneratorTarget(t, lg);
this->GeneratorTargets[t] = gt;
- generatorTargets[t] = gt;
+ lg->AddGeneratorTarget(t, gt);
}
}
@@ -1595,9 +1594,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(TargetTypes targetTypes,
{
cmGeneratorTarget* gt = new cmGeneratorTarget(*j, lg);
this->GeneratorTargets[*j] = gt;
- generatorTargets[*j] = gt;
}
- lg->SetGeneratorTargets(generatorTargets);
}
//----------------------------------------------------------------------------