zlib: more cmake fixes