Keep cmake build system in sync with commit d47154c28b68b32177773bd489fdae62b440f38c.