From 6fa02e157a5c91067b7d7b88629472b9ed461193 Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Thu, 7 Sep 2023 15:35:19 +0200 Subject: [PATCH] cmake: disable zlib support when building host tools --- cmake/host.CMakeLists.txt | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/cmake/host.CMakeLists.txt b/cmake/host.CMakeLists.txt index 1768eaf7c1c..d4b770ecd42 100644 --- a/cmake/host.CMakeLists.txt +++ b/cmake/host.CMakeLists.txt @@ -97,17 +97,6 @@ set(BUILD_SHARED_LIBS OFF) set(CMAKE_POSITION_INDEPENDENT_CODE ON) set(BUILD_TESTING OFF) -message(CHECK_START "Fetching ZLIB") -list(APPEND CMAKE_MESSAGE_INDENT " ") -FetchContent_Declare( - zlib - GIT_REPOSITORY "https://github.com/madler/ZLIB.git" - GIT_TAG "v1.2.13" - PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/ZLIB.patch") -FetchContent_MakeAvailable(zlib) -list(POP_BACK CMAKE_MESSAGE_INDENT) -message(CHECK_PASS "fetched") - message(CHECK_START "Fetching Abseil-cpp") list(APPEND CMAKE_MESSAGE_INDENT " ") set(ABSL_ENABLE_INSTALL ON) @@ -128,6 +117,7 @@ set(protobuf_BUILD_TESTS OFF) set(protobuf_BUILD_SHARED_LIBS ON) set(protobuf_BUILD_EXPORT OFF) set(protobuf_MSVC_STATIC_RUNTIME OFF) +set(protobuf_WITH_ZLIB OFF) FetchContent_Declare( protobuf GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"