Updating CMake for v3.1