Merge pull request #6639 from lioncash/zlib

CMakeLists: Link zlib in privately where applicable, and don't dump its includes into the top-level directory

CMakeLists.txt

@@ -572,11 +572,9 @@ endif()
 find_package(ZLIB)
 if(ZLIB_FOUND)
   message(STATUS "Using shared zlib")
-  include_directories(${ZLIB_INCLUDE_DIRS})
 else()
   message(STATUS "Shared zlib not found, falling back to the static library")
   add_subdirectory(Externals/zlib)
-  include_directories(Externals/zlib)
 endif()
 
 if(NOT APPLE)

Externals/zlib/CMakeLists.txt

@@ -77,3 +77,9 @@ set(ZLIB_SRCS
 )
 
 add_library(z STATIC ${ZLIB_SRCS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
+add_library(ZLIB::ZLIB ALIAS z)
+
+target_include_directories(z
+PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)

Source/Core/Core/CMakeLists.txt

@@ -288,11 +288,11 @@ PUBLIC
   videonull
   videoogl
   videosoftware
-  z
 
 PRIVATE
   bdisasm
   ${LZO}
+  ZLIB::ZLIB
 )
 
 if (APPLE)

Source/Core/DiscIO/CMakeLists.txt

@@ -21,3 +21,8 @@ add_library(discio
   WiiSaveBanner.cpp
   WiiWad.cpp
 )
+
+target_link_libraries(discio
+PRIVATE
+  ZLIB::ZLIB
+)