diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-09 14:02:45 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-09 14:02:45 (GMT) |
| commit | e187351c5f7c1c1ef844df6be4d19bfd303266ae (patch) | |
| tree | 19966f66547c73367a2a59834a1c076047a353d8 /Source | |
| parent | 49910f1a2c9819a848b8d3b4c15d970039d7f101 (diff) | |
| parent | 2c470b775ab54f565383c95200d16dc42d94fe17 (diff) | |
| download | CMake-e187351c5f7c1c1ef844df6be4d19bfd303266ae.zip CMake-e187351c5f7c1c1ef844df6be4d19bfd303266ae.tar.gz CMake-e187351c5f7c1c1ef844df6be4d19bfd303266ae.tar.bz2 | |
Merge topic 'allow-OBJECT-library-extra-sources'
2c470b77 add_library: Allow arbitrary non-linked sources in OBJECT libraries
de4f3e2c Tests: Fix broken dependency in ObjectLibrary test
54bf5858 Tests: Resolve TODO comment left in ObjectLibrary test
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index eccb06a..64c5822 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -38,7 +38,8 @@ void reportBadObjLib(std::vector<cmSourceFile*> const& badObjLib, { e << " " << (*i)->GetLocation().GetName() << "\n"; } - e << "but may contain only headers and sources that compile."; + e << "but may contain only sources that compile, header files, and " + "other files that would not affect linking of a normal library."; cm->IssueMessage(cmake::FATAL_ERROR, e.str(), target->GetBacktrace()); } @@ -205,10 +206,6 @@ struct TagVisitor else { DoAccept<IsSameTag<Tag, ExtraSourcesTag>::Result>::Do(this->Data, sf); - if(this->IsObjLib && ext != "txt") - { - this->BadObjLibFiles.push_back(sf); - } } } }; |