updated cmakes after subtreemerge