Merge branch 'master' into fix_aarch64

Possibly not needed
Signed-off-by: Ettore Di Giacinto <mudler@localai.io>
2026-02-03 11:13:31 -05:00 · 2024-07-09 23:15:00 +02:00 · 2024-07-09 23:12:19 +02:00 · 2024-07-09 23:11:51 +02:00
2 changed files with 9 additions and 1 deletions
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -106,6 +106,7 @@ jobs:
          CROSS_TOOLCHAIN=/usr/$GNU_HOST
          CROSS_STAGING_PREFIX=$CROSS_TOOLCHAIN/stage
          CMAKE_CROSS_TOOLCHAIN=/tmp/arm.toolchain.cmake
+
          go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@8ba23be9613c672d40ae261d2a1335d639bdd59b
          go install google.golang.org/protobuf/cmd/protoc-gen-go@v1.34.0
          export PATH=$PATH:$GOPATH/bin
--- a/backend/cpp/llama/CMakeLists.txt
+++ b/backend/cpp/llama/CMakeLists.txt
@@ -83,4 +83,11 @@ target_link_libraries(${TARGET} PRIVATE common llama myclip ${CMAKE_THREAD_LIBS_
 target_compile_features(${TARGET} PRIVATE cxx_std_11)
 if(TARGET BUILD_INFO)
  add_dependencies(${TARGET} BUILD_INFO)
-endif()
+endif()
+
+include(FetchContent)
+FetchContent_Declare(
+  googletest
+  URL https://github.com/google/googletest/archive/03597a01ee50ed33e9dfd640b249b4be3799d395.zip
+)
+FetchContent_MakeAvailable(googletest)
Author	SHA1	Message	Date
Ettore Di Giacinto	9080e6442d	Merge branch 'master' into fix_aarch64	2024-07-09 23:15:00 +02:00
Ettore Di Giacinto	3492026b63	Possibly not needed Signed-off-by: Ettore Di Giacinto <mudler@localai.io>	2024-07-09 23:12:19 +02:00
Ettore Di Giacinto	ea97fe67e2	ci(arm64): fix llama.cpp build by adding googletest to CMakefile Signed-off-by: Ettore Di Giacinto <mudler@localai.io>	2024-07-09 23:11:51 +02:00