Testing capabilities for cmake system

Also some temporary changes for what will be built
Merge branch 'cmake_build' into windows_build