Skip to content

Commit ed15447

Browse files
knopers8lkrcal
authored andcommitted
use grpc++ instead of grpc++_unsecure
With the recent grpc bump, grpc causes troubles when both grpc and grpc_unsecure are loaded by the same binary. Here, it is the case when StfSender and StfBuilder load the OccLite plugin (which uses grpc). This change fixes both and allows them to be controlled by ECS again, tested on a VM setup with FLP suite. I do not know if it might break DataDistribution in some other context, I hope that anyone reviewing it may know...
1 parent e134144 commit ed15447

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

src/DataDistControl/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ target_link_libraries(ddcontrol
7171
PUBLIC
7272
ppconsul
7373
protobuf::libprotobuf
74-
gRPC::grpc++_unsecure
74+
gRPC::grpc++
7575
PRIVATE
7676
base
7777
FairMQ::FairMQ

src/common/discovery/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ target_link_libraries(discovery
7171
PUBLIC
7272
ppconsul
7373
protobuf::libprotobuf
74-
gRPC::grpc++_unsecure
74+
gRPC::grpc++
7575
FairMQ::FairMQ
7676
PRIVATE
7777
base

0 commit comments

Comments
 (0)