Backport an upstream patch to provide compatibility with cmake 4.x. (Patch context adapted due to missing unrelated commits) Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>