Mac build, untested,
Fixing CMake for upcoming buildbot machines