Update with an even better patch to cmake.