From 44bacb3b1676af6ed5e1818b58fcf85f90f07f0d Mon Sep 17 00:00:00 2001 From: Gerald Combs Date: Fri, 28 Jun 2024 09:49:21 -0700 Subject: [PATCH] update(cmake): Make sure we link zlib with the correct Windows CRT Set CMAKE_POLICY_DEFAULT_CMP0091, CMAKE_MSVC_RUNTIME_LIBRARY, and CMAKE_BUILD_TYPE when we configure zlib, similar to our other dependencies. Signed-off-by: Gerald Combs --- cmake/modules/zlib.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake/modules/zlib.cmake b/cmake/modules/zlib.cmake index 872e4455d8..13f92db51e 100644 --- a/cmake/modules/zlib.cmake +++ b/cmake/modules/zlib.cmake @@ -85,6 +85,9 @@ else() BUILD_IN_SOURCE 1 BUILD_BYPRODUCTS ${ZLIB_LIB} CMAKE_ARGS + -DCMAKE_POLICY_DEFAULT_CMP0091:STRING=NEW + -DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY} + -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_POSITION_INDEPENDENT_CODE=${ENABLE_PIC} -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -DCMAKE_INSTALL_PREFIX=${ZLIB_SRC})