Tweak OS X CMake paths for OpenCV
Merge branch 'master' of https://github.com/Eyescale/CMake