[Bug 789219] New: cmake: change in behaviour makes builds fail