Check in updated CMake dependencies after Evan's latest round of