lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-30 22:43:08 +03:00
Code Activity

Revert "Remove zlib"

Browse Source 
This reverts commit d874a1fd14.

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.
This commit is contained in:
Gilles Peskine
2020-02-26 19:11:43 +01:00
committed by Ronald Cron
parent 70824f2c9e
commit 5bb8bec1de
6 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/CMakeLists.txt
View File

@ -148,6 +148,10 @@ if(HAIKU)
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()