Updated cmake