cmake improvements on windows