Skip to content

Commit 5ef5733

Browse files
committed
build: prefer using find_package for gPRC
adding CMAKE_TOOLCHAIN_FILE for source ExternalProject
1 parent ff970d0 commit 5ef5733

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ ExternalProject_Add(BearSource
5555
-DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
5656
-DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
5757
-DPKG_CONFIG_EXECUTABLE:PATH=${PKG_CONFIG_EXECUTABLE}
58+
-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}
5859
CMAKE_CACHE_ARGS
5960
-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}
6061
-DCMAKE_INSTALL_PREFIX:PATH=${STAGED_INSTALL_PREFIX}

source/CMakeLists.txt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,13 @@ find_package(nlohmann_json REQUIRED)
2727
find_package(fmt REQUIRED)
2828
find_package(spdlog REQUIRED)
2929
find_package(PkgConfig REQUIRED)
30-
pkg_check_modules(gRPC REQUIRED IMPORTED_TARGET protobuf grpc++)
30+
find_package(gRPC)
31+
if (gRPC_FOUND)
32+
set(GRPC_TARGET gRPC::grpc++)
33+
else ()
34+
pkg_check_modules(gRPC REQUIRED IMPORTED_TARGET protobuf grpc++)
35+
set(GRPC_TARGET PkgConfig::gRPC)
36+
endif()
3137

3238
if (UNIX AND NOT APPLE)
3339
set(SUPPORT_PRELOAD 1)

source/intercept/proto/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ target_sources(rpc_a
6262
INTERFACE
6363
$<TARGET_OBJECTS:rpc_a>
6464
)
65-
target_link_libraries(rpc_a PUBLIC PkgConfig::gRPC)
65+
target_link_libraries(rpc_a PUBLIC ${GRPC_TARGET})

0 commit comments

Comments
 (0)