Updated CMake rules on OSX