merged from trunk

svn path=/branches/proto/v4/CMakeLists.txt; revision=49607