Skip to content

Commit 0ca68c7

Browse files
committed
Updates!
1 parent 5232d6e commit 0ca68c7

File tree

5 files changed

+1201
-797
lines changed

5 files changed

+1201
-797
lines changed

CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ include(CheckIncludeFileCXX)
55
#set(CMAKE_WARN_DEPRECATED YES)
66
set(CMAKE_WARN_UNUSED_CLI YES)
77

8+
include(FetchContent)
9+
FetchContent_Declare(
10+
Jsonifier
11+
GIT_REPOSITORY https://github.com/realtimechris/jsonifier.git
12+
GIT_TAG dev
13+
)
14+
15+
# Also provides "common"
16+
FetchContent_MakeAvailable(Jsonifier)
17+
818
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
919

1020
if (NOT XCODE AND NOT MSVC AND NOT CMAKE_BUILD_TYPE)
@@ -211,6 +221,8 @@ set(LLAMA_PUBLIC_HEADERS
211221
${CMAKE_CURRENT_SOURCE_DIR}/include/llama.h
212222
${CMAKE_CURRENT_SOURCE_DIR}/include/llama-cpp.h)
213223

224+
target_link_libraries(llama PUBLIC Jsonifier::Jsonifier)
225+
214226
set_target_properties(llama
215227
PROPERTIES
216228
PUBLIC_HEADER "${LLAMA_PUBLIC_HEADERS}")

CMakePresets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"binaryDir": "${sourceDir}/build-${presetName}",
99
"cacheVariables": {
1010
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
11-
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/.."
11+
"CMAKE_INSTALL_RPATH": "$ORIGIN;$ORIGIN/..",
12+
"LLAMA_CURL": "OFF"
1213
}
1314
},
1415
{

0 commit comments

Comments
 (0)