cmake: Backed out changeset d62544e5fa7a

This is being replaced by a different patch (see Bugzilla #4970).
2 files changed