CMakeList refact