Merge pull request #6576 from lioncash/iconv

CMakeLists: Remove iconv from the LIBS variable
dolphin-emu · Apr 2, 2018 · dea30e0 · dea30e0
2 parents 80525cf + 8db4ab7
commit dea30e0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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