diff options
| author | Stephen Kelly <steveire@gmail.com> | 2016-10-07 18:13:33 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2016-10-07 18:13:33 (GMT) |
| commit | 2232e97a6ed4a338b814d1ba3d62a7ffa9ef6e7f (patch) | |
| tree | d4b8f117c3361f72a81658ed00181c8183c6589e | |
| parent | 9a1d4e4ba170f4ac34c80593bd2fe8e1481a1181 (diff) | |
| download | CMake-2232e97a6ed4a338b814d1ba3d62a7ffa9ef6e7f.zip CMake-2232e97a6ed4a338b814d1ba3d62a7ffa9ef6e7f.tar.gz CMake-2232e97a6ed4a338b814d1ba3d62a7ffa9ef6e7f.tar.bz2 | |
cmTarget: Remove useless link library state
| -rw-r--r-- | Source/cmTarget.cxx | 4 | ||||
| -rw-r--r-- | Source/cmTarget.h | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx index 5b878d3..0e7e2a5 100644 --- a/Source/cmTarget.cxx +++ b/Source/cmTarget.cxx @@ -479,9 +479,6 @@ cmSourceFile* cmTarget::AddSource(const std::string& src) void cmTarget::MergeLinkLibraries(cmMakefile& mf, const std::string& selfname, const LinkLibraryVectorType& libs) { - assert(this->PrevLinkedLibraries.empty()); - // Only add on libraries we haven't added on before. - // Assumption: the global link libraries could only grow, never shrink LinkLibraryVectorType::const_iterator i = libs.begin(); for (; i != libs.end(); ++i) { // This is equivalent to the target_link_libraries plain signature. @@ -490,7 +487,6 @@ void cmTarget::MergeLinkLibraries(cmMakefile& mf, const std::string& selfname, "INTERFACE_LINK_LIBRARIES", this->GetDebugGeneratorExpressions(i->first, i->second).c_str()); } - this->PrevLinkedLibraries = libs; } void cmTarget::AddLinkDirectory(const std::string& d) diff --git a/Source/cmTarget.h b/Source/cmTarget.h index dd9097a..f062529 100644 --- a/Source/cmTarget.h +++ b/Source/cmTarget.h @@ -299,7 +299,6 @@ private: std::vector<cmCustomCommand> PreLinkCommands; std::vector<cmCustomCommand> PostBuildCommands; std::vector<std::pair<TLLSignature, cmListFileContext> > TLLCommands; - LinkLibraryVectorType PrevLinkedLibraries; LinkLibraryVectorType OriginalLinkLibraries; cmMakefile* Makefile; cmTargetInternalPointer Internal; |