Merge pull request #4403 from hkleynhans/select_bundled_zlib cmake: Allow user to select bundled zlib