From eee32c030b5a07dd0bd46d44e739976a152fa6de Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 31 Mar 2018 14:59:12 -0400 Subject: [PATCH] CMakeLists: Remove lzo from the LIBS variable and make linkage private The only place this library is needed (core) is already linked in the core target. Also make the linkage private to create linkage failures if the dependency isn't explicitly linked in elsewhere where it should be. Reduces the dependency on the LIBS variable. --- CMakeLists.txt | 1 - Source/Core/Core/CMakeLists.txt | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c3bac050c2..cbc55984f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -597,7 +597,6 @@ else() include_directories(Externals/LZO) set(LZO lzo2) endif() -list(APPEND LIBS ${LZO}) if(NOT APPLE) check_lib(PNG libpng png png.h QUIET) diff --git a/Source/Core/Core/CMakeLists.txt b/Source/Core/Core/CMakeLists.txt index 7a9e2dba1c..60d6d23769 100644 --- a/Source/Core/Core/CMakeLists.txt +++ b/Source/Core/Core/CMakeLists.txt @@ -280,7 +280,6 @@ PUBLIC discio enet inputcommon - ${LZO} ${MBEDTLS_LIBRARIES} pugixml sfml-network @@ -289,6 +288,9 @@ PUBLIC videoogl videosoftware z + +PRIVATE + ${LZO} ) if (APPLE)