Sync cmake files with upstream once again