Updated CMakelists