Merge pull request #6576 from lioncash/iconv

CMakeLists: Remove iconv from the LIBS variable
This commit is contained in:
Markus Wick 2018-04-02 11:07:19 +02:00 committed by GitHub
commit dea30e08bf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -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)

View File

@ -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