Merge pull request #6639 from lioncash/zlib CMakeLists: Link zlib in privately where applicable, and don't dump its includes into the top-level directory