Another update in preparation for CMake 3.1.