Make cmake-help-command more helpful (correct branch)

This is the same as #86 but applied on an up-to-date version of master.