cmake: more fixes