even more cmake fixes

even more cmake fixes