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

Merge pull request #6606 from lioncash/bochs 

CMakeLists: Link bochs in privately where applicable
This commit is contained in:
Léo Lam 2018-04-08 11:08:12 +02:00 committed by GitHub
parent 0a290f5d11 f1be7cd4a0
commit 9dbc760bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/CMakeLists.txt
View File

@ -276,7 +276,6 @@ endif()
target_link_libraries(core target_link_libraries(core
PUBLIC PUBLIC
audiocommon audiocommon
bdisasm
common common
cubeb cubeb
discio discio
@ -292,6 +291,7 @@ PUBLIC
z z
PRIVATE PRIVATE
bdisasm
${LZO} ${LZO}
) )

1
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -85,6 +85,7 @@ add_executable(dolphin-emu
target_link_libraries(dolphin-emu target_link_libraries(dolphin-emu
PRIVATE PRIVATE
bdisasm
core core
uicommon uicommon
cpp-optparse cpp-optparse

1
Source/Core/UICommon/CMakeLists.txt
View File

@ -15,6 +15,7 @@ PUBLIC
cpp-optparse cpp-optparse
PRIVATE PRIVATE
bdisasm
$<$<BOOL:APPLE>:${IOK_LIBRARY}> $<$<BOOL:APPLE>:${IOK_LIBRARY}>
) )

2
Source/UnitTests/CMakeLists.txt
View File

@ -16,7 +16,7 @@ macro(add_dolphin_test target)
$<TARGET_OBJECTS:unittests_stubhost> $<TARGET_OBJECTS:unittests_stubhost>
) )
set_target_properties(${target} PROPERTIES FOLDER Tests) set_target_properties(${target} PROPERTIES FOLDER Tests)
target_link_libraries(${target} core uicommon gtest_main) target_link_libraries(${target} PRIVATE core uicommon gtest_main)
add_dependencies(unittests ${target}) add_dependencies(unittests ${target})
add_test(NAME ${target} COMMAND ${target}) add_test(NAME ${target} COMMAND ${target})
endmacro() endmacro()

2
Source/UnitTests/Common/CMakeLists.txt
View File

@ -12,4 +12,6 @@ add_dolphin_test(NandPathsTest NandPathsTest.cpp)
add_dolphin_test(SPSCQueueTest SPSCQueueTest.cpp) add_dolphin_test(SPSCQueueTest SPSCQueueTest.cpp)
add_dolphin_test(StringUtilTest StringUtilTest.cpp) add_dolphin_test(StringUtilTest StringUtilTest.cpp)
add_dolphin_test(SwapTest SwapTest.cpp) add_dolphin_test(SwapTest SwapTest.cpp)
add_dolphin_test(x64EmitterTest x64EmitterTest.cpp) add_dolphin_test(x64EmitterTest x64EmitterTest.cpp)
target_link_libraries(x64EmitterTest PRIVATE bdisasm)