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

ENH: Adding automatic generation of several 64-bit search path forms.

This commit is contained in:
Brad King 2005-04-07 14:30:48 -04:00
parent 290ffc01b6
commit 0d494a031c
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmMakefile.cxx
View File

@ -2191,16 +2191,29 @@ std::string cmMakefile::FindLibrary(const char* name,
std::vector<std::string> path64; std::vector<std::string> path64;
if(size == 8) if(size == 8)
{ {
// add a 64 to the name of all the search paths // Convert each search path to possible 32- and 64-bit versions
// of the names. Check for the existence of each one here to
// avoid repeating the check for every file search.
for(std::vector<std::string>::iterator i = path.begin(); for(std::vector<std::string>::iterator i = path.begin();
i != path.end(); ++i) i != path.end(); ++i)
{ {
std::string s = *i; std::string s = *i;
s += "64"; std::string s2 = *i;
path64.push_back(s); cmSystemTools::ReplaceString(s, "lib/", "lib64/");
if(cmSystemTools::FileIsDirectory(s.c_str()))
{
path64.push_back(s);
}
s2 += "64";
if(cmSystemTools::FileIsDirectory(s2.c_str()))
{
path64.push_back(s2);
}
if(cmSystemTools::FileIsDirectory(i->c_str()))
{
path64.push_back(*i);
}
} }
// now append the regular names
path64.insert(path64.end(), path.begin(), path.end());
// now look for the library in the 64 bit path // now look for the library in the 64 bit path
return cmSystemTools::FindLibrary(name, path64); return cmSystemTools::FindLibrary(name, path64);
} }