Updated cmake building