From 1018c0822b80cdfc5d6b589fe94d1fd759113ef6 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Fri, 15 May 2020 23:44:23 +0200
Subject: [PATCH] Drop explicit Zlib dependency
---
CMakeLists.txt | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e27d9d69f..1850b271c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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
--
GitLab