More cmake changes. r2