even more cmake fixes