updated CMake to work for GR 3.7