Cmake changes r7