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