Fix latest PackageConfig change
Merge branch 'master' of https://github.com/Eyescale/CMake