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
dolphin-emu · Apr 13, 2018 · b84806e · b84806e
2 parents 9d70097 + 2851c7e
commit b84806e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/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)

diff --git a/Externals/zlib/CMakeLists.txt b/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}
+)
diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt
@@ -288,11 +288,11 @@ PUBLIC
   videonull
   videoogl
   videosoftware
-  z
 
 PRIVATE
   bdisasm
   ${LZO}
+  ZLIB::ZLIB
 )
 
 if (APPLE)

diff --git a/Source/Core/DiscIO/CMakeLists.txt b/Source/Core/DiscIO/CMakeLists.txt
@@ -21,3 +21,8 @@ add_library(discio
   WiiSaveBanner.cpp
   WiiWad.cpp
 )
+
+target_link_libraries(discio
+PRIVATE
+  ZLIB::ZLIB
+)