Cmake changes r6