mirror of
https://git.citron-emu.org/citron/emulator
synced 2026-01-05 01:23:47 +00:00
Merge branch 'boost_process_fix' into 'main'
fix: boost_process Linux issue See merge request citron/emulator!66
This commit is contained in:
@@ -1220,12 +1220,29 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz)
|
||||
if(ANDROID)
|
||||
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
|
||||
else()
|
||||
target_link_libraries(core PUBLIC Boost::headers Boost::process PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
|
||||
# Link against all the libraries that are always required.
|
||||
target_link_libraries(core
|
||||
PUBLIC
|
||||
common
|
||||
Boost::headers
|
||||
PRIVATE
|
||||
audio_core
|
||||
hid_core
|
||||
network
|
||||
video_core
|
||||
nx_tzdb
|
||||
tz
|
||||
fmt::fmt
|
||||
nlohmann_json::nlohmann_json
|
||||
mbedtls
|
||||
RenderDoc::API
|
||||
)
|
||||
|
||||
# Conditionally link against Boost::process ONLY if it was found by the main CMakeLists.txt.
|
||||
if(Boost_PROCESS_FOUND)
|
||||
target_link_libraries(core PUBLIC Boost::process)
|
||||
endif()
|
||||
|
||||
if (MINGW)
|
||||
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
|
||||
endif()
|
||||
|
||||
Reference in New Issue
Block a user