main: add --json-schema / -j flag (ggml-org#6659)

ochafik · tybalex · commit d20a6426cb67 · 2024-04-18T14:58:09.000-07:00
* main: add --json-schema / -j

* json: move json-schema-to-grammar to common lib

* json: fix zig build
diff --git a/examples/server/CMakeLists.txt b/examples/server/CMakeLists.txt
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ install(TARGETS ${TARGET} RUNTIME)`
`11`	`11`	`target_compile_definitions(${TARGET} PRIVATE`
`12`	`12`	`SERVER_VERBOSE=$<BOOL:${LLAMA_SERVER_VERBOSE}>`
`13`	`13`	`)`
`14`		`-target_link_libraries(${TARGET} PRIVATE common json-schema-to-grammar ${CMAKE_THREAD_LIBS_INIT})`
	`14`	`+target_link_libraries(${TARGET} PRIVATE common ${CMAKE_THREAD_LIBS_INIT})`
`15`	`15`	`if (LLAMA_SERVER_SSL)`
`16`	`16`	`find_package(OpenSSL REQUIRED)`
`17`	`17`	`target_link_libraries(${TARGET} PRIVATE OpenSSL::SSL OpenSSL::Crypto)`