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

[Enhancement] use starrocks libre2 and libprotobuf for starlet #18810

Merged
merged 1 commit into from
Mar 2, 2023
Merged

[Enhancement] use starrocks libre2 and libprotobuf for starlet #18810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions be/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,10 +376,10 @@ if (${WITH_BLOCK_CACHE} STREQUAL "ON")
endif()

if ("${USE_STAROS}" STREQUAL "ON")
find_package(protobuf CONFIG REQUIRED)
message(STATUS "Using protobuf ${protobuf_VERSION}")
message(STATUS "protobuf include path: ${protobuf_INCLUDE_DIRS}")
message(STATUS "protobuf libs: ${protobuf_LIBS}")
# starrocks project has its imported libprotobuf.a and libre2.a
# add following ALIAS so grpc can find the correct dependent libraries
add_library(protobuf::libprotobuf ALIAS protobuf)
add_library(re2::re2 ALIAS re2)

find_package(gRPC CONFIG REQUIRED)
message(STATUS "Using gRPC ${gRPC_VERSION}")
Expand Down
1 change: 0 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ if [ ${BUILD_BE} -eq 1 ] ; then
-DUSE_STAROS=${USE_STAROS} \
-DWITH_BENCH=${WITH_BENCH} \
-DWITH_BLOCK_CACHE=${WITH_BLOCK_CACHE} \
-Dprotobuf_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/protobuf \
-Dabsl_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl \
-DgRPC_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc \
-Dprometheus-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp \
Expand Down
1 change: 0 additions & 1 deletion run-be-ut.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,6 @@ if [ "${USE_STAROS}" == "ON" ]; then
-DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
-DUSE_STAROS=${USE_STAROS} -DWITH_GCOV=${WITH_GCOV} \
-DWITH_BLOCK_CACHE=${WITH_BLOCK_CACHE} \
-Dprotobuf_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/protobuf \
-Dabsl_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/absl \
-DgRPC_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/grpc \
-Dprometheus-cpp_DIR=${STARLET_INSTALL_DIR}/third_party/lib/cmake/prometheus-cpp \
Expand Down