Merge pull request #8846 from nyanpasu64/fix-cmake-zlib

Fix Windows CMake builds with shared zlib
This commit is contained in:
Léo Lam
2020-10-22 01:11:27 +02:00
committed by GitHub
3 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -23,7 +23,7 @@ PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
)
target_link_libraries(png PUBLIC z)
target_link_libraries(png PUBLIC ZLIB::ZLIB)
if(NOT MSVC)
target_compile_options(png
+1 -1
View File
@@ -13,6 +13,6 @@ endif()
add_library(minizip STATIC ${SRCS})
target_include_directories(minizip PUBLIC .)
target_link_libraries(minizip PUBLIC z)
target_link_libraries(minizip PUBLIC ZLIB::ZLIB)
add_library(MiniZip::minizip ALIAS minizip)
+1 -1
View File
@@ -7,7 +7,7 @@ add_library(updatercommon
target_link_libraries(updatercommon PRIVATE
uicommon
mbedtls
z
ZLIB::ZLIB
ed25519
cpp-optparse
)