File tree Expand file tree Collapse file tree 3 files changed +9
-2
lines changed Expand file tree Collapse file tree 3 files changed +9
-2
lines changed Original file line number Diff line number Diff 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}
Original file line number Diff line number Diff line change @@ -27,7 +27,13 @@ find_package(nlohmann_json REQUIRED)
2727find_package (fmt REQUIRED)
2828find_package (spdlog REQUIRED)
2929find_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
3238if (UNIX AND NOT APPLE )
3339 set (SUPPORT_PRELOAD 1)
Original file line number Diff line number Diff 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} )
You can’t perform that action at this time.
0 commit comments