aboutsummaryrefslogtreecommitdiffstats
path: root/meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch
diff options
context:
space:
mode:
authorGrigory Kletsko <grigory.kletsko@cogentembedded.com>2017-08-18 12:20:31 +0300
committerGrigory Kletsko <grigory.kletsko@cogentembedded.com>2017-08-18 12:20:31 +0300
commitc167cd68d5af35436864294330e101b615454522 (patch)
tree6a15d7803754df3e941fd1489a59948f401da8f1 /meta-rcar-gen3-adas/recipes-graphics/opencv/opencv/useoeprotobuf.patch
parent09d4ad9e0acdb3afec31dd674ae5d4d76a65df5f (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.patch13
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)