From acf1a91b901994c54b41af42e08491c854c4b5d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Wed, 1 Oct 2025 13:26:26 +0200 Subject: [PATCH 1/2] fix_ci_cmake_pkg --- .github/workflows/build-cmake-pkg.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cmake-pkg.yml b/.github/workflows/build-cmake-pkg.yml index fee2ab96bd0..fa604bb6f47 100644 --- a/.github/workflows/build-cmake-pkg.yml +++ b/.github/workflows/build-cmake-pkg.yml @@ -25,7 +25,7 @@ jobs: cmake --build build --config Release cmake --install build --prefix "$PREFIX" --config Release - export LLAMA_CONFIG="$PREFIX"/lib/cmake/llama/llama-config.cmake + export LLAMA_CONFIG="$PREFIX"/share/llama/llama-config.cmake tclsh <<'EOF' set build(commit) [string trim [exec git rev-parse --short HEAD]] set build(number) [string trim [exec git rev-list --count HEAD]] @@ -47,5 +47,5 @@ jobs: EOF cd examples/simple-cmake-pkg - cmake -S . -B build -DCMAKE_PREFIX_PATH="$PREFIX"/lib/cmake + cmake -S . -B build -DCMAKE_PREFIX_PATH="$PREFIX"/share cmake --build build From 8753ee4804de59e055ef6e8bfd02257d79b811aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs?= Date: Wed, 1 Oct 2025 14:14:38 +0200 Subject: [PATCH 2/2] fix_cmake_linking --- examples/simple-cmake-pkg/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple-cmake-pkg/CMakeLists.txt b/examples/simple-cmake-pkg/CMakeLists.txt index 128e38c8f2d..06e2692a1d8 100644 --- a/examples/simple-cmake-pkg/CMakeLists.txt +++ b/examples/simple-cmake-pkg/CMakeLists.txt @@ -7,5 +7,5 @@ find_package(Llama REQUIRED) add_executable(${TARGET} ${CMAKE_CURRENT_LIST_DIR}/../simple/simple.cpp) install(TARGETS ${TARGET} RUNTIME) -target_link_libraries(${TARGET} PRIVATE llama ggml::all ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${TARGET} PRIVATE llama::llama ggml::all ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_17)