updated CMakelist to fit changes