the cmake patch from Andreas seems only partially applied - breaks building 2.3.3

This patch is still missing to make it work.