more cmake changes