update CMakelist.txt and GAF submodule