Ongoing work on the cmake build. (#20371)