summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2008-10-13 13:58:22 (GMT)
committerBrad King <brad.king@kitware.com>2008-10-13 13:58:22 (GMT)
commitc1075aef7b24feaee5048042c4da9f1010938958 (patch)
treededc1ef6e9a347dcb358b366802bd71d03145484
parented7c45b2633e6605e219985ad08bca4949a79efe (diff)
downloadCMake-c1075aef7b24feaee5048042c4da9f1010938958.zip
CMake-c1075aef7b24feaee5048042c4da9f1010938958.tar.gz
CMake-c1075aef7b24feaee5048042c4da9f1010938958.tar.bz2
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.
-rw-r--r--Source/cmFindBase.cxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
index 5d58783..3b2a704 100644
--- a/Source/cmFindBase.cxx
+++ b/Source/cmFindBase.cxx
@@ -489,13 +489,7 @@ void cmFindBase::AddPathSuffixes()
// later with lib being replaced for lib64 which may exist
paths.push_back(p);
}
- }
- // 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
+ // now put the path without the path suffixes in the SearchPaths
paths.push_back(*i);
}
}