Updated MSVC side of CMake files after recent changes.