Cmakelist changes