more changes to cmake related things