mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-08-05 07:39:17 +00:00
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:
parent
9d7009796c
commit
b256f873ca
3 changed files with 7 additions and 1 deletions
1
Externals/zlib/CMakeLists.txt
vendored
1
Externals/zlib/CMakeLists.txt
vendored
|
@ -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)
|
||||||
|
|
|
@ -288,11 +288,11 @@ PUBLIC
|
||||||
videonull
|
videonull
|
||||||
videoogl
|
videoogl
|
||||||
videosoftware
|
videosoftware
|
||||||
z
|
|
||||||
|
|
||||||
PRIVATE
|
PRIVATE
|
||||||
bdisasm
|
bdisasm
|
||||||
${LZO}
|
${LZO}
|
||||||
|
ZLIB::ZLIB
|
||||||
)
|
)
|
||||||
|
|
||||||
if (APPLE)
|
if (APPLE)
|
||||||
|
|
|
@ -21,3 +21,8 @@ add_library(discio
|
||||||
WiiSaveBanner.cpp
|
WiiSaveBanner.cpp
|
||||||
WiiWad.cpp
|
WiiWad.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
|
target_link_libraries(discio
|
||||||
|
PRIVATE
|
||||||
|
ZLIB::ZLIB
|
||||||
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue