The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-09 15:49:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

CMakeLists: Don't dump zlib's includes into the top-level directory

Browse Source
This commit is contained in:
Lioncash 2018-04-13 08:14:56 -04:00
parent b256f873ca
commit 2851c7e5ee
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

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

5
Externals/zlib/CMakeLists.txt vendored
View File

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