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

Fix Windows CMake builds with shared zlib
dolphin-emu · Oct 21, 2020 · 08f9ed0 · 08f9ed0
2 parents 96ce3e5 + 1a2b6ca
commit 08f9ed0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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

diff --git 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)
diff --git 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
 )