some more cmake changes