Merge pull request #932 from r-chris/make-zlib-optional
authorKim Kulling <kimkulling@users.noreply.github.com>
Mon, 4 Jul 2016 13:00:13 +0000 (15:00 +0200)
committerGitHub <noreply@github.com>
Mon, 4 Jul 2016 13:00:13 +0000 (15:00 +0200)
Allowing to enable building of zlib manually through CMake option.

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge