From 8db4ab7dd6afd52442a3209e9a642e0462b61e99 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sun, 1 Apr 2018 13:49:34 -0400 Subject: [PATCH] CMakeLists: Remove iconv from the LIBS variable Adjusts Common to use the ICONV_LIBRARIES variable directly and doesn't append it to the LIBS variable. After this, there's only one remaining usage where libraries are added to the LIBS variable, after which it can be removed once the rest of the targets are migrated off add_dolphin_library --- CMakeLists.txt | 1 - Source/Core/Common/CMakeLists.txt | 7 +++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6f20c890b8..4c2600de65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -706,7 +706,6 @@ else() add_subdirectory(Externals/libiconv-1.14) set(ICONV_LIBRARIES iconv) endif() -list(APPEND LIBS ${ICONV_LIBRARIES}) if(NOT ANDROID) find_package(HIDAPI) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 10e8cd39b8..4ef3af3ac5 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -44,12 +44,16 @@ add_library(common x64Emitter.cpp ) -target_link_libraries(common PUBLIC +target_link_libraries(common +PUBLIC ${CMAKE_THREAD_LIBS_INIT} ${CURL_LIBRARIES} enet ${MBEDTLS_LIBRARIES} ${VTUNE_LIBRARIES} + +PRIVATE + ${ICONV_LIBRARIES} ) if (APPLE) @@ -65,7 +69,6 @@ if(ANDROID) target_sources(common PRIVATE Logging/ConsoleListenerDroid.cpp ) - target_link_libraries(common PRIVATE iconv) elseif(WIN32) target_sources(common PRIVATE Logging/ConsoleListenerWin.cpp