Updated to CMakeLists