Cmake changes r5