Add CMakeLists.txt for testing, in cmake branch
Merge branch 'cmake'