[CMake] More fixes for Windows build