fix CMakeLists for mac
Merge branch 'master' into v314