Improve detection on FindLibs
Merge pull request #1381 from PocketRent/find-libs

Improve detection on FindLibs