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

Fix Windows CMake builds with shared zlib
2020-10-22 01:11:27 +02:00 · 2020-10-22 01:11:27 +02:00 · 08f9ed043b
parent 96ce3e5f49 1a2b6ca2d6
commit 08f9ed043b
3 changed files with 3 additions and 3 deletions
--- a/Externals/libpng/CMakeLists.txt
+++ b/Externals/libpng/CMakeLists.txt
@ -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
--- a/Externals/minizip/CMakeLists.txt
+++ b/Externals/minizip/CMakeLists.txt
@ -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)
--- a/Source/Core/UpdaterCommon/CMakeLists.txt
+++ b/Source/Core/UpdaterCommon/CMakeLists.txt
@ -7,7 +7,7 @@ add_library(updatercommon
 target_link_libraries(updatercommon PRIVATE
  uicommon
  mbedtls
-  z
+  ZLIB::ZLIB
  ed25519
  cpp-optparse
 )