more MSVC cmake fixes
5 files changed