ENH: Make FIND_* commands look in the CMAKE_PREFIX_PATH directories directly after looking in each command's specific subdirectory (/include, /lib, or /bin). This may be useful on Windows where projects could be installed in a single directory. See issue #4947.

Source/cmFindBase.cxx

@@ -603,6 +603,10 @@ void cmFindBase::AddFindPrefix(std::vector<std::string>& dest,
       dirWithSubdir += "/sbin";
       dest.push_back(dirWithSubdir);
       }
+    if(!subdir.empty())
+      {
+      dest.push_back(*it);
+      }
     }
 }