More cmake changes. r3