further cmake tweaks