Skip to content

Commit 72172a1

Browse files
committed
use Protobuf_PROTOC_EXECUTABLE
1 parent 8317a45 commit 72172a1

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

cmake/protobuf.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,20 @@ if(NOT TARGET protobuf::libprotobuf)
6161
message(FATAL_ERROR "A required protobuf target (protobuf::libprotobuf) was not imported")
6262
endif()
6363

64+
if(PROTOBUF_PROTOC_EXECUTABLE AND NOT Protobuf_PROTOC_EXECUTABLE)
65+
message(WARNING "Use of PROTOBUF_PROTOC_EXECUTABLE is deprecated. Please use Protobuf_PROTOC_EXECUTABLE instead.")
66+
set(Protobuf_PROTOC_EXECUTABLE "${PROTOBUF_PROTOC_EXECUTABLE}")
67+
endif()
68+
6469
if(CMAKE_CROSSCOMPILING)
65-
find_program(PROTOBUF_PROTOC_EXECUTABLE protoc)
70+
find_program(Protobuf_PROTOC_EXECUTABLE protoc)
6671
else()
6772
if(NOT TARGET protobuf::protoc)
6873
message(FATAL_ERROR "A required protobuf target (protobuf::protoc) was not imported")
6974
endif()
70-
set(PROTOBUF_PROTOC_EXECUTABLE "$<TARGET_FILE:protobuf::protoc>")
75+
set(Protobuf_PROTOC_EXECUTABLE "$<TARGET_FILE:protobuf::protoc>")
7176
endif()
7277

78+
set(PROTOBUF_PROTOC_EXECUTABLE "${Protobuf_PROTOC_EXECUTABLE}")
79+
7380
message(STATUS "PROTOBUF_PROTOC_EXECUTABLE=${PROTOBUF_PROTOC_EXECUTABLE}")

0 commit comments

Comments
 (0)