Merge pull request #122 from mmha/master

Use documented CMake way of linking zlib