CMake subtree update, OS X and 2.0 Equalizer API fixes