diff options
author | 2017-08-18 12:20:31 +0300 | |
---|---|---|
committer | 2017-09-18 18:49:12 +0300 | |
commit | 1188bae340037667e958665fede72fd40d9a60b8 (patch) | |
tree | b2527e2c2876072692f7bafb2e73bce705b90b6c /meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch | |
parent | 281c2865aea51b0ff7c9748d169ee3542ace4679 (diff) |
Add opencv 3.2 and use it by default
Diffstat (limited to 'meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch')
-rw-r--r-- | meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch new file mode 100644 index 0000000..3068bd4 --- /dev/null +++ b/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch @@ -0,0 +1,13 @@ +diff --git a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake +index eb2a729cc2eb..8717736484de 100644 +--- a/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake ++++ b/modules/dnn/cmake/OpenCVFindLibProtobuf.cmake +@@ -24,7 +24,7 @@ if(NOT BUILD_PROTOBUF AND NOT (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF + find_package(Protobuf QUIET) + endif() + +-if(PROTOBUF_FOUND) ++if(PROTOBUF_FOUND OR (DEFINED PROTOBUF_INCLUDE_DIR AND DEFINED PROTOBUF_LIBRARIES)) + # nothing + else() + include(${CMAKE_CURRENT_LIST_DIR}/download_protobuf.cmake) |