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

Merge pull request #6570 from lioncash/lzo 

CMakeLists: Remove lzo from the LIBS variable and make linkage private
This commit is contained in:
Léo Lam 2018-04-01 11:51:06 +02:00 committed by GitHub
parent 40f3af22bb eee32c030b
commit aaf9f4759f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -597,7 +597,6 @@ else()
include_directories(Externals/LZO) include_directories(Externals/LZO)
set(LZO lzo2) set(LZO lzo2)
endif() endif()
list(APPEND LIBS ${LZO})
if(NOT APPLE) if(NOT APPLE)
check_lib(PNG libpng png png.h QUIET) check_lib(PNG libpng png png.h QUIET)

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

@ -280,7 +280,6 @@ PUBLIC
discio discio
enet enet
inputcommon inputcommon
${LZO}
${MBEDTLS_LIBRARIES} ${MBEDTLS_LIBRARIES}
pugixml pugixml
sfml-network sfml-network
@ -289,6 +288,9 @@ PUBLIC
videoogl videoogl
videosoftware videosoftware
z z
PRIVATE
${LZO}
) )
if (APPLE) if (APPLE)