cmake upgrades