Merge pull request opencv#18589 from alalek:issue_13328

alalek · alalek · commit d2dbc9d7a0ae · 2020-10-15T18:43:48.000Z
diff --git a/3rdparty/protobuf/CMakeLists.txt b/3rdparty/protobuf/CMakeLists.txt
@@ -140,6 +140,7 @@ append_if_exist(Protobuf_SRCS
   ${PROTOBUF_ROOT}/src/google/protobuf/wrappers.pb.cc
 )
 
+include_directories(BEFORE "${PROTOBUF_ROOT}/src")  # ensure using if own headers: https://github.com/opencv/opencv/issues/13328
 add_library(libprotobuf STATIC ${Protobuf_SRCS})
 target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
 set_target_properties(libprotobuf

Original file line number	Diff line number	Diff line change
`@@ -140,6 +140,7 @@ append_if_exist(Protobuf_SRCS`
`140`	`140`	`${PROTOBUF_ROOT}/src/google/protobuf/wrappers.pb.cc`
`141`	`141`	`)`
`142`	`142`
	`143`	`+include_directories(BEFORE "${PROTOBUF_ROOT}/src") # ensure using if own headers: https://github.com/opencv/opencv/issues/13328`
`143`	`144`	`add_library(libprotobuf STATIC ${Protobuf_SRCS})`
`144`	`145`	`target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)`
`145`	`146`	`set_target_properties(libprotobuf`