redid cmake names, compiles on visual studio