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

BUG: make sure link directories are not duplicated

This commit is contained in:
Bill Hoffman 2002-04-29 10:23:29 -04:00
parent b0dd81e665
commit ecbc720829
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmMakefile.cxx
View File

@ -539,10 +539,25 @@ void cmMakefile::AddLinkDirectory(const char* dir)
// linear search results in n^2 behavior, but n won't be getting
// much bigger than 20. We cannot use a set because of order
// dependency of the link search path.
if(std::find(m_LinkDirectories.begin(),
m_LinkDirectories.end(), dir) == m_LinkDirectories.end())
// remove trailing slashes
if(dir && dir[strlen(dir)-1] == '/')
{
m_LinkDirectories.push_back(dir);
std::string newdir = dir;
newdir = newdir.substr(0, newdir.size()-1);
if(std::find(m_LinkDirectories.begin(),
m_LinkDirectories.end(), newdir.c_str()) == m_LinkDirectories.end())
{
m_LinkDirectories.push_back(newdir);
}
}
else
{
if(std::find(m_LinkDirectories.begin(),
m_LinkDirectories.end(), dir) == m_LinkDirectories.end())
{
m_LinkDirectories.push_back(dir);
}
}
}