CMAKE: Add zlib to the libraries list when png is added
Merge branch 'master' of https://github.com/mapserver/mapserver