CMakeList updated
Cmakelist merged