From 2fc553df606ba8643f5180d454a2e6dc91561856 Mon Sep 17 00:00:00 2001 From: Nikolai Kostrigin Date: Fri, 23 Jun 2023 00:54:36 +0300 Subject: [PATCH 2/2] Restore system ZLIB version determination in CMake functions This improves "Set variables to PARENT_SCOPE in CMake functions" commit by Meng-Hsiu Chiang which in turn fixes 1f2b9d62 (refer to the link). Prevent system ZLIB autodetection error: "CMake Error at cmake/zlib.cmake:134 (MESSAGE): ZLIB version must be at least 1.2.13, found . Please use -DWITH_ZLIB=bundled Call Stack (most recent call first): CMakeLists.txt:1742 (MYSQL_CHECK_ZLIB) Link: https://github.com/mysql/mysql-server/pull/468 Signed-off-by: Nikolai Kostrigin --- cmake/zlib.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/zlib.cmake b/cmake/zlib.cmake index 633ca494d3ac..cd269905f655 100644 --- a/cmake/zlib.cmake +++ b/cmake/zlib.cmake @@ -60,6 +60,7 @@ FUNCTION(FIND_SYSTEM_ZLIB) TARGET_INCLUDE_DIRECTORIES(zlib_interface SYSTEM INTERFACE ${ZLIB_INCLUDE_DIR}) ENDIF() + FIND_ZLIB_VERSION(${ZLIB_INCLUDE_DIR}) SET(ZLIB_FOUND ${ZLIB_FOUND} PARENT_SCOPE) SET(ZLIB_VERSION ${ZLIB_VERSION} PARENT_SCOPE) ENDIF()