Refs #6315. CMake tweaking.