More work on OSX cmake