cmake: more fixes before going to sleep