MSVC CMake generation optimization (#2852)

5 files changed