Skip to content

Commit a9b1014

Browse files
committed
try fix protobuf on cmake
1 parent 15d5ab4 commit a9b1014

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
sudo apt-get update
6969
sudo apt-get install build-essential ffmpeg
7070
71-
sudo apt-get install -y ca-certificates cmake curl patch libprotobuf-dev protobuf-compiler
71+
sudo apt-get install -y ca-certificates cmake curl patch libabsl-dev libprotobuf-dev protobuf-compiler
7272
sudo apt-get install -y libopencv-dev && sudo ln -s /usr/include/opencv4/opencv2 /usr/include/opencv2
7373
sudo pip install -r extra/requirements.txt
7474

backend/cpp/llama/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,16 @@ set(_PROTOBUF_LIBPROTOBUF libprotobuf)
55
set(_REFLECTION grpc++_reflection)
66

77
find_package(absl REQUIRED)
8-
find_package(Protobuf CONFIG REQUIRED)
98
find_package(gRPC CONFIG REQUIRED)
109
find_program(_PROTOBUF_PROTOC protoc)
1110
set(_GRPC_GRPCPP grpc++)
1211
find_program(_GRPC_CPP_PLUGIN_EXECUTABLE grpc_cpp_plugin)
12+
13+
# find_package(Protobuf CONFIG REQUIRED) is not working, see:
14+
# https://gitlab.kitware.com/cmake/cmake/-/issues/24321
15+
set(CMAKE_FIND_PACKAGE_PREFER_CONFIG 1)
16+
find_package(Protobuf)
17+
1318
include_directories(${CMAKE_CURRENT_BINARY_DIR})
1419
include_directories(${Protobuf_INCLUDE_DIRS})
1520

0 commit comments

Comments
 (0)