Skip to content

Commit

Permalink
update(cmake): Make sure we link zlib with the correct Windows CRT
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
geraldcombs authored and poiana committed Jun 28, 2024
1 parent 372946e commit 1058afc
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions cmake/modules/zlib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 1058afc

Please sign in to comment.