Skip to content
Snippets Groups Projects
Commit 1018c082 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Drop explicit Zlib dependency

parent 91d5e422
No related branches found
No related tags found
No related merge requests found
......@@ -30,8 +30,6 @@ option(USE_BUNDLED_OPENSSL "Use the bundled version of OpenSSL."
${HUNTER_ENABLED})
option(USE_BUNDLED_SODIUM "Use the bundled version of libsodium."
${HUNTER_ENABLED})
option(USE_BUNDLED_ZLIB "Use the bundled version of zlib."
${HUNTER_ENABLED})
if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
project(matrix_client
......@@ -93,16 +91,6 @@ set_package_properties(OpenSSL PROPERTIES
TYPE REQUIRED
)
if(USE_BUNDLED_ZLIB)
hunter_add_package(ZLIB)
endif()
find_package(ZLIB)
set_package_properties(ZLIB PROPERTIES
DESCRIPTION "A free compression library unencumbered by patents"
URL "https://www.zlib.net/"
TYPE REQUIRED
)
if(USE_BUNDLED_OLM)
include(FetchContent)
FetchContent_Declare(
......@@ -227,7 +215,6 @@ target_link_libraries(matrix_client
OpenSSL::Crypto
OpenSSL::SSL
Olm::Olm
ZLIB::ZLIB
nlohmann_json::nlohmann_json)
# NOTE(Nico): I can't figure out for the life of me, how to export that target
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment