cmake(protobuf): ensure using of own headers

alalek · alalek · commit dfb9832a25e8 · 2019-04-15T22:28:33.000Z
diff --git a/3rdparty/protobuf/CMakeLists.txt b/3rdparty/protobuf/CMakeLists.txt
@@ -139,6 +139,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
`@@ -139,6 +139,7 @@ append_if_exist(Protobuf_SRCS`
`139`	`139`	`${PROTOBUF_ROOT}/src/google/protobuf/wrappers.pb.cc`
`140`	`140`	`)`
`141`	`141`
	`142`	`+include_directories(BEFORE "${PROTOBUF_ROOT}/src") # ensure using if own headers: https://github.com/opencv/opencv/issues/13328`
`142`	`143`	`add_library(libprotobuf STATIC ${Protobuf_SRCS})`
`143`	`144`	`target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)`
`144`	`145`	`set_target_properties(libprotobuf`