Update CMakeLists, Fix compile error

CMakeLists is really lagging behind now