kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: Preserve shared lib order for 2.4 compatibility 

We preserve the order and multiplicity of libraries directly linked by a
target as specified by the user.  Items known to be shared libraries may
be safely skipped because order preservation is only needed for static
libraries.  However, CMake 2.4 did not skip shared libs, so we do the
same when in 2.4 compatibility mode.
This commit is contained in:
Brad King 2008-07-30 09:25:52 -04:00
parent bd4601f987
commit 96c9e7de7e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/cmComputeLinkDepends.cxx
View File

@ -881,6 +881,11 @@ void cmComputeLinkDepends::CheckWrongConfigItem(std::string const& item)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmComputeLinkDepends::PreserveOriginalEntries() 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. // Regular expression to match shared libraries.
cmsys::RegularExpression shared_lib(this->SharedRegexString.c_str()); cmsys::RegularExpression shared_lib(this->SharedRegexString.c_str());
@ -893,7 +898,7 @@ void cmComputeLinkDepends::PreserveOriginalEntries()
{ {
cmTarget* tgt = this->EntryList[*in].Target; cmTarget* tgt = this->EntryList[*in].Target;
if((tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) || if((tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) ||
(!tgt && shared_lib.find(this->EntryList[*in].Item))) (skipShared && !tgt && shared_lib.find(this->EntryList[*in].Item)))
{ {
// Skip input items known to not be static libraries. // Skip input items known to not be static libraries.
++in; ++in;
@ -917,7 +922,7 @@ void cmComputeLinkDepends::PreserveOriginalEntries()
{ {
cmTarget* tgt = this->EntryList[*in].Target; cmTarget* tgt = this->EntryList[*in].Target;
if((tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) || if((tgt && tgt->GetType() != cmTarget::STATIC_LIBRARY) ||
(!tgt && shared_lib.find(this->EntryList[*in].Item))) (skipShared && !tgt && shared_lib.find(this->EntryList[*in].Item)))
{ {
// Skip input items known to not be static libraries. // Skip input items known to not be static libraries.
++in; ++in;