I guess our hack for pre-3.3 doesn't work in 3.3, but thankfully
we can include both the pre-3.3 workaround and the actual 3.3+ fix,
and it looks like cmake will end up doing the right thing in both cases.