OS X CMake improvements