summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2006-08-26 02:56:36 (GMT)
committerBrad King <brad.king@kitware.com>2006-08-26 02:56:36 (GMT)
commited6791c8986741e630844a155b7ce684a623b8c3 (patch)
tree3f7f0a0110f52ff937e0a3be38f8eab7c823bd8c
parent6e2f8199420d0f51bf5a02bb29f32a9d6016b1e6 (diff)
downloadCMake-ed6791c8986741e630844a155b7ce684a623b8c3.zip
CMake-ed6791c8986741e630844a155b7ce684a623b8c3.tar.gz
CMake-ed6791c8986741e630844a155b7ce684a623b8c3.tar.bz2
BUG: Make sure targets of type GLOBAL_TARGET have a makefile set.
-rw-r--r--Source/cmGlobalGenerator.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 49b0e1e..0f4d13e 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -716,12 +716,13 @@ void cmGlobalGenerator::Generate()
}
for (i = 0; i < this->LocalGenerators.size(); ++i)
{
- cmTargets* targets =
- &(this->LocalGenerators[i]->GetMakefile()->GetTargets());
+ cmMakefile* mf = this->LocalGenerators[i]->GetMakefile();
+ cmTargets* targets = &(mf->GetTargets());
cmTargets::iterator tit;
for ( tit = globalTargets.begin(); tit != globalTargets.end(); ++ tit )
{
(*targets)[tit->first] = tit->second;
+ (*targets)[tit->first].SetMakefile(mf);
}
}