File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -128,7 +128,7 @@ if(WITH_OTLP)
128128 set (protobuf_MODULE_COMPATIBLE ON )
129129 find_package (Protobuf )
130130 find_package (gRPC )
131- if ((NOT Protobuf_FOUND) OR (NOT gRPC_FOUND))
131+ if ((NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND ) OR (NOT gRPC_FOUND))
132132 if (WIN32 AND (NOT DEFINED CMAKE_TOOLCHAIN_FILE ))
133133 install_windows_deps ()
134134 endif ()
@@ -140,7 +140,7 @@ if(WITH_OTLP)
140140 include (${CMAKE_TOOLCHAIN_FILE} )
141141 endif ()
142142
143- if (NOT Protobuf_FOUND)
143+ if (NOT Protobuf_FOUND AND NOT PROTOBUF_FOUND )
144144 find_package (Protobuf REQUIRED )
145145 endif ()
146146 if (NOT gRPC_FOUND)
@@ -155,7 +155,9 @@ if(WITH_OTLP)
155155 endif ()
156156 endif ()
157157 # Latest Protobuf uses mixed case instead of uppercase
158- set (PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE} )
158+ if (Protobuf_PROTOC_EXECUTABLE)
159+ set (PROTOBUF_PROTOC_EXECUTABLE ${Protobuf_PROTOC_EXECUTABLE} )
160+ endif ()
159161 endif ()
160162 message ("PROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_PROTOC_EXECUTABLE} " )
161163
You can’t perform that action at this time.
0 commit comments