More cmake changes r4