Changes in CMake.  Refs #7948.