Skip to content
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

Jump to bottom

fix build test_log linked error #385

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix build test_log linked error #385

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
508937a
Fix action fail problem
nmreadelf Feb 14, 2023
d7e9857
fix build test_log link thirft error
nmreadelf Feb 14, 2023
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
3 changes: 2 additions & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: false
matrix:
compiler: [clang, gcc]
os: [ubuntu-latest]
os: [ubuntu-20.04]
build_tool: [cmake, bazel]
with_test: [true, false]
exclude:
Expand Down Expand Up @@ -46,6 +46,7 @@ jobs:
- name: Install dependencies on Linux
if: ${{ runner.os == 'Linux' }}
run: |
sudo apt-get update
sudo apt-get install -qq libgflags-dev \
libprotobuf-dev libprotoc-dev protobuf-compiler \
libleveldb-dev libgoogle-perftools-dev
Expand Down
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ if(BRPC_WITH_GLOG)
include_directories(${GLOG_INCLUDE_PATH})
endif()

if(BRPC_WITH_THRIFT)
find_library(THRIFT_LIB NAMES thrift)
endif()

if(LEVELDB_WITH_SNAPPY)
find_library(SNAPPY_LIB NAMES snappy)
endif()
Expand Down Expand Up @@ -126,6 +130,12 @@ if(LEVELDB_WITH_SNAPPY)
)
endif()

if(BRPC_WITH_THRIFT)
set(DYNAMIC_LIB ${DYNAMIC_LIB}
${THRIFT_LIB}
)
endif()

if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
set(DYNAMIC_LIB ${DYNAMIC_LIB}
pthread
Expand Down
6 changes: 3 additions & 3 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@ http_archive(

http_archive(
name = "com_github_brpc_brpc",
sha256 = "c0168d22205724bfa1939c9ad79bd9f74a98e0bd05be9e8f5cc504ef44c676a1",
strip_prefix = "incubator-brpc-1.0.0-rc02",
url = "https://github.com/apache/incubator-brpc/archive/refs/tags/1.0.0-rc02.tar.gz"
sha256 = "58a06997ae07c1654979fb8356884481ab9803b60de04c1b341d986e2b62220d",
strip_prefix = "brpc-1.1.0",
url = "https://github.com/apache/incubator-brpc/archive/refs/tags/1.1.0.tar.gz"
)

bind(
Expand Down