Merge pull request #2283 from xammy:cmake-cmp0054

PiperOrigin-RevId: 253052041