Fixed cmake for windows builds
Merge remote-tracking branch 'upstream/master'