More cmake changes