ENH: Improve CMP0003 to provide more compatibility

- Targets built in the tree now add compatibility paths too
  - The warning message's first list includes at most one item
    for each unique compatibility path
  - Clarified error message further
This commit is contained in:
Brad King 2008-03-14 14:21:57 -04:00
parent f874cd684c
commit e395fee080
1 changed files with 17 additions and 3 deletions

View File

@ -1001,6 +1001,15 @@ void cmComputeLinkInformation::AddTargetItem(std::string const& item,
this->Items.push_back(Item(this->LibLinkFileFlag, false)); this->Items.push_back(Item(this->LibLinkFileFlag, false));
} }
// For compatibility with CMake 2.4 include the item's directory in
// the linker search path.
if(this->OldLinkDirMode &&
this->OldLinkDirMask.find(cmSystemTools::GetFilenamePath(item)) ==
this->OldLinkDirMask.end())
{
this->OldLinkDirItems.push_back(item);
}
// Now add the full path to the library. // Now add the full path to the library.
this->Items.push_back(Item(item, true)); this->Items.push_back(Item(item, true));
} }
@ -1372,16 +1381,21 @@ void cmComputeLinkInformation::PrintLinkPolicyDiagnosis(std::ostream& os)
os << "Target \"" << this->Target->GetName() << "\" "; os << "Target \"" << this->Target->GetName() << "\" ";
// List the items that would add paths in old behavior. // List the items that would add paths in old behavior.
os << " links to some items with known full path:\n"; std::set<cmStdString> emitted;
os << " links to some items by full path not located in any linker search "
<< "directory added by a link_directories command:\n";
for(std::vector<std::string>::const_iterator for(std::vector<std::string>::const_iterator
i = this->OldLinkDirItems.begin(); i = this->OldLinkDirItems.begin();
i != this->OldLinkDirItems.end(); ++i) i != this->OldLinkDirItems.end(); ++i)
{ {
os << " " << *i << "\n"; if(emitted.insert(cmSystemTools::GetFilenamePath(*i)).second)
{
os << " " << *i << "\n";
}
} }
// List the items that might need the old-style paths. // List the items that might need the old-style paths.
os << "and to some items with no path known:\n"; os << "This is okay but it also links to some items with no path known:\n";
{ {
// Format the list of unknown items to be as short as possible while // Format the list of unknown items to be as short as possible while
// still fitting in the allowed width (a true solution would be the // still fitting in the allowed width (a true solution would be the