diff options
author | Stephen Kelly <steveire@gmail.com> | 2014-03-14 12:21:26 (GMT) |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2014-04-02 21:12:57 (GMT) |
commit | aa0a3562dd47bdd6d9ca3058bd1dfd525e79d36d (patch) | |
tree | dc08a5a7988c2f941b50347ffd03eb48eeec2544 /Source/cmGlobalGenerator.h | |
parent | 042c1c834e69ee60b605b02bad8be87b2193a7d2 (diff) | |
download | CMake-aa0a3562dd47bdd6d9ca3058bd1dfd525e79d36d.zip CMake-aa0a3562dd47bdd6d9ca3058bd1dfd525e79d36d.tar.gz CMake-aa0a3562dd47bdd6d9ca3058bd1dfd525e79d36d.tar.bz2 |
cmGeneratorTarget: Compute target objects on demand
Add a ComputeObjectMapping method to compute the object
names. It takes mapping to populate as an out-parameter so
that it can be extended in the future with parameters
relevant to generator expression evaluation.
Remove the supporting cmGeneratorTarget::AddObject method. It is
no longer needed as the container member is populated directly.
The ComputeObjectMapping method is called whenever objects are
requested from the cmGeneratorTarget. Because the Xcode generator
makes no such request, explicitly invoke the method from that
generator so that the logic of checking for bad sources in object
libraries is executed.
In a follow-up, the UseObjectLibraries usage may be replaced by a
true generator expression evaluator for TARGET_OBJECTS. That
will require generators to use cmGeneratorTarget::GetExternalObjects
which is not currently the case for Xcode and VS generators.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r-- | Source/cmGlobalGenerator.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 668bb6b..54f5f3b 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -444,8 +444,6 @@ private: friend class cmake; void CreateGeneratorTargets(cmMakefile* mf); void CreateGeneratorTargets(); - void ComputeGeneratorTargetObjects(); - void ComputeTargetObjects(cmGeneratorTarget* gt) const; void ClearGeneratorMembers(); |