commit 5bb8bec1de91e8d497446ccfc066db8802600218
author Gilles Peskine <Gilles.Peskine@arm.com> Wed Feb 26 19:11:43 2020 +0100
committer Ronald Cron <ronald.cron@arm.com> Thu Mar 19 14:07:55 2020 +0100
tree 8b0be4d654a475d6d66dd7620fc319954048d64e
parent 70824f2c9ea28a0c044f14d967ce21899f41441d

Revert "Remove zlib"

This reverts commit d874a1fd14bdf3df8ee232f539ac613adaae648c.

Conflicts:
* CMakeLists.txt:
  * ENABLE_ZLIB_SUPPORT: there has been a change immediately after
    where it was removed. Just re-add what was removed.
* tests/CMakeLists.txt:
  * ENABLE_ZLIB_SUPPORT: there has been a change immediately after
    where it was removed. Just re-add what was removed.

library/CMakeLists.txt

diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 8db0828..a602a6b 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -148,6 +148,10 @@
     set(libs ${libs} network)
 endif(HAIKU)
 
+if(ENABLE_ZLIB_SUPPORT)
+    set(libs ${libs} ${ZLIB_LIBRARIES})
+endif(ENABLE_ZLIB_SUPPORT)
+
 if(LINK_WITH_PTHREAD)
     set(libs ${libs} pthread)
 endif()