Updated CMakeList. Fixed errors