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

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
This commit is contained in:
Lioncash 2018-04-01 13:49:34 -04:00
parent 92a37a40ca
commit 8db4ab7dd6
No known key found for this signature in database
GPG Key ID: 4E3C3CC1031BA9C7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -706,7 +706,6 @@ else()
add_subdirectory(Externals/libiconv-1.14) add_subdirectory(Externals/libiconv-1.14)
set(ICONV_LIBRARIES iconv) set(ICONV_LIBRARIES iconv)
endif() endif()
list(APPEND LIBS ${ICONV_LIBRARIES})
if(NOT ANDROID) if(NOT ANDROID)
find_package(HIDAPI) find_package(HIDAPI)

7
Source/Core/Common/CMakeLists.txt
View File

@ -44,12 +44,16 @@ add_library(common
x64Emitter.cpp x64Emitter.cpp
) )
target_link_libraries(common PUBLIC target_link_libraries(common
PUBLIC
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
${CURL_LIBRARIES} ${CURL_LIBRARIES}
enet enet
${MBEDTLS_LIBRARIES} ${MBEDTLS_LIBRARIES}
${VTUNE_LIBRARIES} ${VTUNE_LIBRARIES}
PRIVATE
${ICONV_LIBRARIES}
) )
if (APPLE) if (APPLE)
@ -65,7 +69,6 @@ if(ANDROID)
target_sources(common PRIVATE target_sources(common PRIVATE
Logging/ConsoleListenerDroid.cpp Logging/ConsoleListenerDroid.cpp
) )
target_link_libraries(common PRIVATE iconv)
elseif(WIN32) elseif(WIN32)
target_sources(common PRIVATE target_sources(common PRIVATE
Logging/ConsoleListenerWin.cpp Logging/ConsoleListenerWin.cpp