Skip to content

Update llama.cpp submodule to 9723942 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
daavoo merged 2 commits into from
Aug 31, 2026
Merged

Update llama.cpp submodule to 9723942 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cd6d2b
Update llama.cpp submodule to 9723942
github-actions[bot] Aug 31, 2026
cc1e4d3
fix: Adapt to llama.cpp renaming its `common` target to `llama-common`
daavoo Aug 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 25 additions & 14 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,20 @@ if(AGENT_CPP_BUNDLED_LLAMA)
set(LLAMA_LLGUIDANCE OFF CACHE BOOL "" FORCE)

add_subdirectory(${LLAMA_SOURCE_DIR} ${CMAKE_BINARY_DIR}/llama.cpp)

# Recent llama.cpp renamed the `common` target to `llama-common`.
# Support both so older pinned versions keep working. Cached so that the
# standalone example projects (which add this directory as a subdirectory)
# can use it too.
if(TARGET llama-common)
set(LLAMA_COMMON_TARGET llama-common CACHE INTERNAL "llama.cpp common target name")
else()
set(LLAMA_COMMON_TARGET common CACHE INTERNAL "llama.cpp common target name")
endif()
else()
# Use system-installed llama.cpp
find_package(llama REQUIRED)
set(LLAMA_COMMON_TARGET common CACHE INTERNAL "llama.cpp common target name")
message(STATUS "Using system-installed llama.cpp")
endif()

Expand All @@ -58,7 +69,7 @@ target_include_directories(model
$<BUILD_INTERFACE:${LLAMA_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/agent-cpp>
)
target_link_libraries(model PUBLIC common llama)
target_link_libraries(model PUBLIC ${LLAMA_COMMON_TARGET} llama)
target_compile_features(model PUBLIC cxx_std_17)

add_library(agent STATIC src/agent.cpp)
Expand All @@ -72,7 +83,7 @@ target_include_directories(agent
$<BUILD_INTERFACE:${LLAMA_SOURCE_DIR}/vendor>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/agent-cpp>
)
target_link_libraries(agent PUBLIC model common llama)
target_link_libraries(agent PUBLIC model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(agent PUBLIC cxx_std_17)

# MCP Client library for connecting to MCP servers via HTTP
Expand All @@ -93,7 +104,7 @@ if(AGENT_CPP_BUILD_MCP)
$<BUILD_INTERFACE:${LLAMA_SOURCE_DIR}/common>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/agent-cpp>
)
target_link_libraries(mcp_client PUBLIC common OpenSSL::SSL OpenSSL::Crypto)
target_link_libraries(mcp_client PUBLIC ${LLAMA_COMMON_TARGET} OpenSSL::SSL OpenSSL::Crypto)
target_compile_features(mcp_client PUBLIC cxx_std_17)

message(STATUS "MCP client enabled (using cpp-httplib)")
Expand All @@ -117,7 +128,7 @@ if(AGENT_CPP_BUILD_OAUTH)
$<BUILD_INTERFACE:${LLAMA_SOURCE_DIR}/common>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/agent-cpp>
)
target_link_libraries(oauth PUBLIC common OpenSSL::SSL OpenSSL::Crypto)
target_link_libraries(oauth PUBLIC ${LLAMA_COMMON_TARGET} OpenSSL::SSL OpenSSL::Crypto)
target_compile_features(oauth PUBLIC cxx_std_17)

message(STATUS "OAuth client enabled (using cpp-httplib)")
Expand All @@ -128,7 +139,7 @@ if(AGENT_CPP_BUILD_TESTS)

add_executable(test_tool tests/test_tool.cpp)
target_include_directories(test_tool PRIVATE src tests)
target_link_libraries(test_tool PRIVATE common llama)
target_link_libraries(test_tool PRIVATE ${LLAMA_COMMON_TARGET} llama)
target_compile_features(test_tool PRIVATE cxx_std_17)

add_executable(test_grammar tests/test_grammar.cpp)
Expand All @@ -140,7 +151,7 @@ if(AGENT_CPP_BUILD_TESTS)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(test_grammar PRIVATE model common llama)
target_link_libraries(test_grammar PRIVATE model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(test_grammar PRIVATE cxx_std_17)

add_executable(test_callbacks tests/test_callbacks.cpp)
Expand All @@ -152,7 +163,7 @@ if(AGENT_CPP_BUILD_TESTS)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(test_callbacks PRIVATE agent model common llama)
target_link_libraries(test_callbacks PRIVATE agent model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(test_callbacks PRIVATE cxx_std_17)

add_test(NAME ToolTests COMMAND test_tool)
Expand All @@ -166,7 +177,7 @@ if(AGENT_CPP_BUILD_TESTS)
tests
${LLAMA_SOURCE_DIR}/common
)
target_link_libraries(test_mcp_client PRIVATE mcp_client common)
target_link_libraries(test_mcp_client PRIVATE mcp_client ${LLAMA_COMMON_TARGET})
target_compile_features(test_mcp_client PRIVATE cxx_std_17)

add_test(NAME MCPClientTests COMMAND test_mcp_client)
Expand Down Expand Up @@ -194,7 +205,7 @@ if(AGENT_CPP_BUILD_EXAMPLES)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(shell-example PRIVATE agent model common llama)
target_link_libraries(shell-example PRIVATE agent model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(shell-example PRIVATE cxx_std_17)

# Memory example
Expand All @@ -207,7 +218,7 @@ if(AGENT_CPP_BUILD_EXAMPLES)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(memory-example PRIVATE agent model common llama)
target_link_libraries(memory-example PRIVATE agent model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(memory-example PRIVATE cxx_std_17)

# Multi-agent example
Expand All @@ -220,7 +231,7 @@ if(AGENT_CPP_BUILD_EXAMPLES)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(multi-agent-example PRIVATE agent model common llama)
target_link_libraries(multi-agent-example PRIVATE agent model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(multi-agent-example PRIVATE cxx_std_17)

# Context engineering example
Expand All @@ -233,7 +244,7 @@ if(AGENT_CPP_BUILD_EXAMPLES)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(context-engineering-example PRIVATE agent model common llama)
target_link_libraries(context-engineering-example PRIVATE agent model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(context-engineering-example PRIVATE cxx_std_17)

# Grammar example
Expand All @@ -246,7 +257,7 @@ if(AGENT_CPP_BUILD_EXAMPLES)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(grammar-example PRIVATE agent model common llama)
target_link_libraries(grammar-example PRIVATE agent model ${LLAMA_COMMON_TARGET} llama)
target_compile_features(grammar-example PRIVATE cxx_std_17)

# MCP client example (requires MCP support)
Expand All @@ -260,7 +271,7 @@ if(AGENT_CPP_BUILD_EXAMPLES)
${LLAMA_SOURCE_DIR}/include
${LLAMA_SOURCE_DIR}/vendor
)
target_link_libraries(mcp-example PRIVATE agent model mcp_client common llama)
target_link_libraries(mcp-example PRIVATE agent model mcp_client ${LLAMA_COMMON_TARGET} llama)
target_compile_features(mcp-example PRIVATE cxx_std_17)
endif()

Expand Down
2 changes: 1 addition & 1 deletion deps/llama.cpp
Open in desktop
Submodule llama.cpp updated from 389ff6 to 972394
2 changes: 1 addition & 1 deletion examples/context-engineering/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(context-engineering-example PRIVATE
${LLAMA_SOURCE_DIR}/vendor
)

target_link_libraries(context-engineering-example PRIVATE agent-cpp::agent common llama)
target_link_libraries(context-engineering-example PRIVATE agent-cpp::agent ${LLAMA_COMMON_TARGET} llama)
target_compile_features(context-engineering-example PRIVATE cxx_std_17)

message(STATUS "Context engineering example configured.")
2 changes: 1 addition & 1 deletion examples/grammar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(grammar-example PRIVATE
${LLAMA_SOURCE_DIR}/vendor
)

target_link_libraries(grammar-example PRIVATE agent-cpp::agent common llama)
target_link_libraries(grammar-example PRIVATE agent-cpp::agent ${LLAMA_COMMON_TARGET} llama)
target_compile_features(grammar-example PRIVATE cxx_std_17)

message(STATUS "Grammar example configured.")
2 changes: 1 addition & 1 deletion examples/mcp/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ target_include_directories(mcp-example PRIVATE
${LLAMA_SOURCE_DIR}/vendor
)

target_link_libraries(mcp-example PRIVATE agent mcp_client common llama)
target_link_libraries(mcp-example PRIVATE agent mcp_client ${LLAMA_COMMON_TARGET} llama)
target_compile_features(mcp-example PRIVATE cxx_std_17)

message(STATUS "MCP example configured.")
2 changes: 1 addition & 1 deletion examples/memory/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(memory-example PRIVATE
${LLAMA_SOURCE_DIR}/vendor
)

target_link_libraries(memory-example PRIVATE agent-cpp::agent common llama)
target_link_libraries(memory-example PRIVATE agent-cpp::agent ${LLAMA_COMMON_TARGET} llama)
target_compile_features(memory-example PRIVATE cxx_std_17)

message(STATUS "Memory as tool example configured.")
2 changes: 1 addition & 1 deletion examples/multi-agent/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(multi-agent-example PRIVATE
${LLAMA_SOURCE_DIR}/vendor
)

target_link_libraries(multi-agent-example PRIVATE agent-cpp::agent common llama)
target_link_libraries(multi-agent-example PRIVATE agent-cpp::agent ${LLAMA_COMMON_TARGET} llama)
target_compile_features(multi-agent-example PRIVATE cxx_std_17)

message(STATUS "Multi-agent example configured.")
2 changes: 1 addition & 1 deletion examples/shell/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ target_include_directories(shell-example PRIVATE
${LLAMA_SOURCE_DIR}/vendor
)

target_link_libraries(shell-example PRIVATE agent-cpp::agent common llama)
target_link_libraries(shell-example PRIVATE agent-cpp::agent ${LLAMA_COMMON_TARGET} llama)
target_compile_features(shell-example PRIVATE cxx_std_17)

message(STATUS "Shell tool example configured.")
2 changes: 1 addition & 1 deletion examples/tracing/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ target_include_directories(tracing-example PRIVATE

target_link_libraries(tracing-example PRIVATE
agent-cpp::agent
common
${LLAMA_COMMON_TARGET}
llama
opentelemetry_trace
opentelemetry_exporter_otlp_http
Expand Down
Loading