diff options
| author | Stephen Kelly <steveire@gmail.com> | 2014-03-18 15:40:46 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2014-04-02 21:12:56 (GMT) |
| commit | e5da9e51d02ba912bba4f556ecd6453dd187c8d8 (patch) | |
| tree | 1bc042307cf734999bf92d5f82f7feb206d5f3b8 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 5702e10677e72a75370e8c1bbe6f10fa5ad675a9 (diff) | |
| download | CMake-e5da9e51d02ba912bba4f556ecd6453dd187c8d8.zip CMake-e5da9e51d02ba912bba4f556ecd6453dd187c8d8.tar.gz CMake-e5da9e51d02ba912bba4f556ecd6453dd187c8d8.tar.bz2 | |
cmTarget: Allow any generator expression in SOURCES property.
Remove use of UseObjectLibraries from Makefile and Ninja generators. It
is not needed now because those generators use GetExternalObjects
which already contains the objects from object libraries.
The VS10 generator calls both the UseObjectLibraries and the GetExternalObjects
methods. Ensure that duplicates are not created by skipping objects
from object libraries in handling of GetExternalObjects.
Similarly, fix VS6, VS7 and Xcode object handling by skipping
external objects from OBJECT_LIBRARY usage as appropriate.
The error message in the BadSourceExpression1 test is now reported
by the generator expression evaluator, so it has different text.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 6759d05..c520f9e 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -202,9 +202,6 @@ void cmMakefileTargetGenerator::WriteTargetBuildRules() // Generate this object file's rule file. this->WriteObjectRuleFiles(**si); } - - // Add object library contents as external objects. - this->GeneratorTarget->UseObjectLibraries(this->ExternalObjects); } //---------------------------------------------------------------------------- |