BUG: Fix find_* search order with path suffixes
In cmFindBase we were searching all path suffixes appended to all paths before considering the paths without any suffixes. Instead we should consider each path with and without suffixes before moving to the next path. See issue #7783.
This commit is contained in:
parent
ed7c45b263
commit
c1075aef7b
|
@ -489,13 +489,7 @@ void cmFindBase::AddPathSuffixes()
|
||||||
// later with lib being replaced for lib64 which may exist
|
// later with lib being replaced for lib64 which may exist
|
||||||
paths.push_back(p);
|
paths.push_back(p);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// now put the path without the path suffixes in the SearchPaths
|
// now put the path without the path suffixes in the SearchPaths
|
||||||
for(i = finalPath.begin();
|
|
||||||
i != finalPath.end(); ++i)
|
|
||||||
{
|
|
||||||
// put all search paths in because it may later be replaced
|
|
||||||
// by lib64 stuff fixes bug 4009
|
|
||||||
paths.push_back(*i);
|
paths.push_back(*i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue