More cmake for windows tune-ups
2 files changed