Merge branch 'upstream' into concedo_experimental

# Conflicts:
#	Makefile
#	build.zig
#	common/CMakeLists.txt
#	common/common.cpp
#	tests/CMakeLists.txt
This commit is contained in:
Concedo 2024-04-16 17:10:10 +08:00
commit c80e24a96f
9 changed files with 115 additions and 18 deletions

View file

@ -11,7 +11,7 @@ install(TARGETS ${TARGET} RUNTIME)
target_compile_definitions(${TARGET} PRIVATE
SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>
)
target_link_libraries(${TARGET} PRIVATE common json-schema-to-grammar ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(${TARGET} PRIVATE common ${CMAKE_THREAD_LIBS_INIT})
if (LLAMA_SERVER_SSL)
find_package(OpenSSL REQUIRED)
target_link_libraries(${TARGET} PRIVATE OpenSSL::SSL OpenSSL::Crypto)