typo fix.
Merge branch 'cmake'