Progress towards CMake on Windows and Mac.