cmake build
Merge branch 'cmake' into develop