Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18589 from alalek:issue_13328

Browse Source
pull/18590/head
Alexander Alekhin 5 years ago
parent 8c4d415412 dfb9832a25
commit d2dbc9d7a0
1 changed files with 1 additions and 0 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      3rdparty/protobuf/CMakeLists.txt

1
3rdparty/protobuf/CMakeLists.txt vendored
Unescape View File

@ -140,6 +140,7 @@ append_if_exist(Protobuf_SRCS
${PROTOBUF_ROOT}/src/google/protobuf/wrappers.pb.cc ${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}) add_library(libprotobuf STATIC ${Protobuf_SRCS})
target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>) target_include_directories(libprotobuf SYSTEM PUBLIC $<BUILD_INTERFACE:${PROTOBUF_ROOT}/src>)
set_target_properties(libprotobuf set_target_properties(libprotobuf

Write Preview
Loading…
Cancel
Save