summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-03-18 16:46:37 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-03-31 21:18:43 (GMT)
commitbeaa7e037761c734d7587b847d8af1ce3dce37d9 (patch)
tree52a0ade9edc7c1834c48ccff48ba34ef4873ac6e
parent521b930bf4e211735842e71f1eb0018c2184a05f (diff)
downloadCMake-beaa7e037761c734d7587b847d8af1ce3dce37d9.zip
CMake-beaa7e037761c734d7587b847d8af1ce3dce37d9.tar.gz
CMake-beaa7e037761c734d7587b847d8af1ce3dce37d9.tar.bz2
cmGeneratorTarget: Compute the object directory early.
Ensure it is populated before tracing dependencies.
-rw-r--r--Source/cmGlobalGenerator.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 5b6d729..07637b3 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1407,6 +1407,7 @@ void cmGlobalGenerator::CreateGeneratorTargets(cmMakefile *mf)
{
cmTarget* t = &ti->second;
cmGeneratorTarget* gt = new cmGeneratorTarget(t);
+ this->ComputeTargetObjectDirectory(gt);
this->GeneratorTargets[t] = gt;
generatorTargets[t] = gt;
}
@@ -1449,7 +1450,6 @@ void cmGlobalGenerator::ComputeGeneratorTargetObjects()
continue;
}
cmGeneratorTarget* gt = ti->second;
- this->ComputeTargetObjectDirectory(gt);
gt->LookupObjectLibraries();
this->ComputeTargetObjects(gt);
}