diff options
| -rw-r--r-- | Source/cmComputeLinkDepends.cxx | 21 | ||||
| -rw-r--r-- | Source/cmComputeLinkDepends.h | 5 | ||||
| -rw-r--r-- | Source/cmComputeLinkInformation.cxx | 1 |
3 files changed, 2 insertions, 25 deletions
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx index 8d448b8..72dd198 100644 --- a/Source/cmComputeLinkDepends.cxx +++ b/Source/cmComputeLinkDepends.cxx @@ -24,7 +24,6 @@ #include "cmake.h" #include <cmsys/stl/algorithm> -#include <cmsys/RegularExpression.hxx> #include <assert.h> @@ -199,12 +198,6 @@ void cmComputeLinkDepends::SetOldLinkDirMode(bool b) } //---------------------------------------------------------------------------- -void cmComputeLinkDepends::SetSharedRegex(std::string const& regex) -{ - this->SharedRegexString = regex; -} - -//---------------------------------------------------------------------------- std::vector<cmComputeLinkDepends::LinkEntry> const& cmComputeLinkDepends::Compute() { @@ -881,14 +874,6 @@ void cmComputeLinkDepends::CheckWrongConfigItem(std::string const& item) //---------------------------------------------------------------------------- void cmComputeLinkDepends::PreserveOriginalEntries() { - // In CMake 2.4 and below all link items were included in order - // preservation. In CMake 2.6 and above we know it is safe to skip - // shared libraries. - bool skipShared = !this->LocalGenerator->NeedBackwardsCompatibility(2,4); - - // Regular expression to match shared libraries. - cmsys::RegularExpression shared_lib(this->SharedRegexString.c_str()); - // Skip the part of the input sequence that already appears in the // output. std::vector<int>::const_iterator in = this->OriginalEntries.begin(); @@ -897,8 +882,7 @@ void cmComputeLinkDepends::PreserveOriginalEntries() out != this->FinalLinkOrder.end()) { cmTarget* tgt = this->EntryList[*in].Target; - if((tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) || - (skipShared && !tgt && shared_lib.find(this->EntryList[*in].Item))) + if(tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) { // Skip input items known to not be static libraries. ++in; @@ -921,8 +905,7 @@ void cmComputeLinkDepends::PreserveOriginalEntries() while(in != this->OriginalEntries.end()) { cmTarget* tgt = this->EntryList[*in].Target; - if((tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) || - (skipShared && !tgt && shared_lib.find(this->EntryList[*in].Item))) + if(tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) { // Skip input items known to not be static libraries. ++in; diff --git a/Source/cmComputeLinkDepends.h b/Source/cmComputeLinkDepends.h index 1b2809b..3e42580 100644 --- a/Source/cmComputeLinkDepends.h +++ b/Source/cmComputeLinkDepends.h @@ -58,10 +58,6 @@ public: std::set<cmTarget*> const& GetOldWrongConfigItems() const { return this->OldWrongConfigItems; } - /** Set a regular expression that matches strings ending in a shared - library extension. */ - void SetSharedRegex(std::string const& regex); - private: // Context information. @@ -141,7 +137,6 @@ private: // Preservation of original link line. std::vector<int> OriginalEntries; void PreserveOriginalEntries(); - std::string SharedRegexString; // Compatibility help. bool OldLinkDirMode; diff --git a/Source/cmComputeLinkInformation.cxx b/Source/cmComputeLinkInformation.cxx index 119248e..6e0f10b 100644 --- a/Source/cmComputeLinkInformation.cxx +++ b/Source/cmComputeLinkInformation.cxx @@ -511,7 +511,6 @@ bool cmComputeLinkInformation::Compute() // Compute the ordered link line items. cmComputeLinkDepends cld(this->Target, this->Config); cld.SetOldLinkDirMode(this->OldLinkDirMode); - cld.SetSharedRegex(this->SharedRegexString); cmComputeLinkDepends::EntryVector const& linkEntries = cld.Compute(); // Add the link line items. |