mirror of
https://git.eden-emu.dev/archive/citron
synced 2026-04-18 10:40:48 -04: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()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz)
|
# Link against all the libraries that are always required.
|
||||||
if(ANDROID)
|
target_link_libraries(core
|
||||||
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
|
PUBLIC
|
||||||
else()
|
common
|
||||||
target_link_libraries(core PUBLIC Boost::headers Boost::process PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API)
|
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()
|
endif()
|
||||||
|
|
||||||
if (MINGW)
|
if (MINGW)
|
||||||
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
|
target_link_libraries(core PRIVATE ${MSWSOCK_LIBRARY})
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
Reference in New Issue
Block a user