Merge pull request #18589

An error occurred

from alalek:issue_13328

5 years ago · d2dbc9d7a0
parent 8c4d415412 dfb9832a25
commit d2dbc9d7a0
1 changed files with 1 additions and 0 deletions
--- 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