ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CMakeLists: Link in zlib privately where applicable 

Also, use the target name introduced via find_package(ZLIB) instead
of hardcoding the 'z' name in the link libraries.
This commit is contained in:
Lioncash 2018-04-13 08:02:26 -04:00
parent 9d7009796c
commit b256f873ca
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Externals/zlib/CMakeLists.txt vendored
View File

@ -77,3 +77,4 @@ 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)

2
Source/Core/Core/CMakeLists.txt
View File

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

5
Source/Core/DiscIO/CMakeLists.txt
View File

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