From 93002a44001eb387ebac9607e5f2d66503897042 Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Sat, 11 Nov 2006 14:06:38 -0500 Subject: BUG: fix for 4009 lib64 should work with path suffix --- Source/cmFindBase.cxx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx index a22ca27..9c14e8e 100644 --- a/Source/cmFindBase.cxx +++ b/Source/cmFindBase.cxx @@ -621,20 +621,18 @@ void cmFindBase::ExpandRegistryAndCleanPath() j != this->SearchPathSuffixes.end(); ++j) { std::string p = *i + std::string("/") + *j; - if(cmSystemTools::FileIsDirectory(p.c_str())) - { - this->SearchPaths.push_back(p); - } + // add to all paths because the search path may be modified + // later with lib being replaced for lib64 which may exist + this->SearchPaths.push_back(p); } } // now put the path without the path suffixes in the SearchPaths for(i = finalPath.begin(); i != finalPath.end(); ++i) { - if(cmSystemTools::FileIsDirectory(i->c_str())) - { - this->SearchPaths.push_back(*i); - } + // put all search paths in because it may later be replaced + // by lib64 stuff fixes bug 4009 + this->SearchPaths.push_back(*i); } } -- cgit v0.12