Fix hwloc finder for good, hopefully...
Merge branch 'master' of https://github.com/Eyescale/CMake