fixups for master of #4789
update cmake options and documentation (#4784)

closes #4784