Skip to content

Commit

Permalink
Fix protoc searching with non-imported protobuf::protoc target. (#2362)
Browse files Browse the repository at this point in the history
  • Loading branch information
@owent
owent authored Oct 14, 2023
1 parent 2c4b2a9 commit 3ff4b4c
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,11 @@ if(WITH_OTLP_GRPC OR WITH_OTLP_HTTP)
if(TARGET protobuf::protoc)
project_build_tools_get_imported_location(PROTOBUF_PROTOC_EXECUTABLE
protobuf::protoc)
# If protobuf::protoc is not a imported target, then we use the target
# directly for fallback
if(NOT PROTOBUF_PROTOC_EXECUTABLE)
set(PROTOBUF_PROTOC_EXECUTABLE protobuf::protoc)
endif()
elseif(Protobuf_PROTOC_EXECUTABLE)
# Some versions of FindProtobuf.cmake uses mixed case instead of uppercase
set(PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE})
Expand Down

2 comments on commit 3ff4b4c

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp api Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 3ff4b4c Previous: 2c4b2a9 Ratio
BM_SpinLockThrashing/1/process_time/real_time 0.509718289742103 ms/iter 0.12333266711513523 ms/iter 4.13
BM_SpinLockThrashing/2/process_time/real_time 1.536367250525433 ms/iter 0.24637652606498905 ms/iter 6.24
BM_ProcYieldSpinLockThrashing/1/process_time/real_time 0.7423945615206722 ms/iter 0.159140189207906 ms/iter 4.67
BM_ProcYieldSpinLockThrashing/2/process_time/real_time 1.413601416128653 ms/iter 0.2449832607865962 ms/iter 5.77
BM_NaiveSpinLockThrashing/1/process_time/real_time 0.5472196291570794 ms/iter 0.1232657782489699 ms/iter 4.44
BM_NaiveSpinLockThrashing/2/process_time/real_time 1.3653016090393066 ms/iter 0.24517055974065316 ms/iter 5.57

This comment was automatically generated by workflow using github-action-benchmark.

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'OpenTelemetry-cpp sdk Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.

Benchmark suite Current: 3ff4b4c Previous: 2c4b2a9 Ratio
BM_BaselineBuffer/1 1209794.044494629 ns/iter 536843.306962326 ns/iter 2.25

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.