forked from Green-Sky/tomato
Squashed 'external/toxcore/c-toxcore/' changes from 55752a2e2ef..f785959eace
f785959eace chore: add to_string functions for netprof enums a95b7957288 cleanup: Heap allocate network profile objects a3c80149edd feat: Implement Tox network profiler ac812871a2e feat: implement the last 2 missing network struct functions and make use of them 29d1043be0b test: friend request test now tests min/max message sizes 93aafd78c1f fix: friend requests with very long messages are no longer dropped 819aa2b2618 feat: Add option to disable DNS lookups in toxcore. 0ac23cee035 fix: windows use of REUSEADDR 7d2811d302d chore(ci): make bazel server shutdown faster 1dc399ba20d chore: Use vcpkg instead of conan in the MSVC build. 14d823165d9 chore: Migrate to conan 2. bdd17c16787 cleanup: Allocate logger using tox memory allocator. b396c061515 chore(deps): bump third_party/cmp from `2ac6bca` to `52bfcfa` 2e94da60d09 feat(net): add missing connect to network struct 41fb1839c7b chore: Add check to ensure version numbers agree. 934a8301113 chore: Release 0.2.20 3acef4bf044 fix: Add missing free in dht_get_nodes_response event. git-subtree-dir: external/toxcore/c-toxcore git-subtree-split: f785959eacebc59590f756b133b52601c335a1d1
This commit is contained in:
@ -8,15 +8,9 @@ if(TARGET toxcore_static)
|
||||
else()
|
||||
target_link_libraries(misc_tools PRIVATE toxcore_shared)
|
||||
endif()
|
||||
if(TARGET unofficial-sodium::sodium)
|
||||
target_link_libraries(misc_tools PRIVATE unofficial-sodium::sodium)
|
||||
else()
|
||||
target_link_libraries(misc_tools PRIVATE ${LIBSODIUM_LIBRARIES})
|
||||
target_link_directories(misc_tools PUBLIC ${LIBSODIUM_LIBRARY_DIRS})
|
||||
target_include_directories(misc_tools SYSTEM PRIVATE ${LIBSODIUM_INCLUDE_DIRS})
|
||||
target_compile_options(misc_tools PRIVATE ${LIBSODIUM_CFLAGS_OTHER})
|
||||
endif()
|
||||
if(TARGET PThreads4W::PThreads4W)
|
||||
if(TARGET pthreads4w::pthreads4w)
|
||||
target_link_libraries(misc_tools PRIVATE pthreads4w::pthreads4w)
|
||||
elseif(TARGET PThreads4W::PThreads4W)
|
||||
target_link_libraries(misc_tools PRIVATE PThreads4W::PThreads4W)
|
||||
elseif(TARGET Threads::Threads)
|
||||
target_link_libraries(misc_tools PRIVATE Threads::Threads)
|
||||
@ -36,7 +30,9 @@ if(BUILD_MISC_TESTS)
|
||||
else()
|
||||
target_link_libraries(Messenger_test PRIVATE toxcore_shared)
|
||||
endif()
|
||||
if(TARGET PThreads4W::PThreads4W)
|
||||
if(TARGET pthreads4w::pthreads4w)
|
||||
target_link_libraries(Messenger_test PRIVATE pthreads4w::pthreads4w)
|
||||
elseif(TARGET PThreads4W::PThreads4W)
|
||||
target_link_libraries(Messenger_test PRIVATE PThreads4W::PThreads4W)
|
||||
elseif(TARGET Threads::Threads)
|
||||
target_link_libraries(Messenger_test PRIVATE Threads::Threads)
|
||||
|
Reference in New Issue
Block a user