diff options
| author | Brad King <brad.king@kitware.com> | 2019-09-23 14:51:40 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-09-23 14:51:55 (GMT) |
| commit | 15163c92349d39f5d0f97578f62e1d1d0194c60b (patch) | |
| tree | 6bfe5e33194f980500b69cd6c7d12a6650cf6fcf /Source | |
| parent | 3d1fb997e5322d6b6e7c4b0b467792995428ebb7 (diff) | |
| parent | 71e677392bb15b1ed87e98b75d19122cdc249c77 (diff) | |
| download | CMake-15163c92349d39f5d0f97578f62e1d1d0194c60b.zip CMake-15163c92349d39f5d0f97578f62e1d1d0194c60b.tar.gz CMake-15163c92349d39f5d0f97578f62e1d1d0194c60b.tar.bz2 | |
Merge topic 'object-library-sources'
71e677392b Do not collect objects from dependencies of object libraries
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3843
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 18ca478..8e3db2b 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -1454,11 +1454,14 @@ std::vector<BT<std::string>> cmGeneratorTarget::GetSourceFilePaths( this, linkInterfaceSourcesEntries, files, uniqueSrcs, debugSources); // Collect TARGET_OBJECTS of direct object link-dependencies. - std::vector<EvaluatedTargetPropertyEntry> linkObjectsEntries; - AddObjectEntries(this, config, &dagChecker, linkObjectsEntries); + bool contextDependentObjects = false; std::vector<std::string>::size_type numFilesBefore2 = files.size(); - bool contextDependentObjects = - processSources(this, linkObjectsEntries, files, uniqueSrcs, debugSources); + if (this->GetType() != cmStateEnums::OBJECT_LIBRARY) { + std::vector<EvaluatedTargetPropertyEntry> linkObjectsEntries; + AddObjectEntries(this, config, &dagChecker, linkObjectsEntries); + contextDependentObjects = processSources(this, linkObjectsEntries, files, + uniqueSrcs, debugSources); + } if (!contextDependentDirectSources && !(contextDependentInterfaceSources && numFilesBefore < files.size()) && |