[Cmake-commits] [cmake-commits] king committed cmFindBase.cxx 1.49 1.50

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv17379/Source

Modified Files:
	cmFindBase.cxx 
Log Message:
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.


Index: cmFindBase.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindBase.cxx,v
retrieving revision 1.49
retrieving revision 1.50
diff -C 2 -d -r1.49 -r1.50
*** cmFindBase.cxx	10 Jun 2008 17:22:18 -0000	1.49
--- cmFindBase.cxx	13 Oct 2008 13:58:22 -0000	1.50
***************
*** 490,500 ****
        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
      paths.push_back(*i);
      }
--- 490,494 ----
        paths.push_back(p);
        }
!     // now put the path without the path suffixes in the SearchPaths
      paths.push_back(*i);
      }