From bfc685697de7eb1e88ebdcaa3dc196af3daa91b4 Mon Sep 17 00:00:00 2001 From: Naveen Saini Date: Wed, 1 Sep 2021 09:18:02 +0800 Subject: open-model-zoo: upgrade 2021.3 -> 2021.4 https://github.com/openvinotoolkit/open_model_zoo/releases/tag/2021.4 Signed-off-by: Naveen Saini Signed-off-by: Anuj Mittal --- .../opencv/open-model-zoo/0001-use-oe-gflags.patch | 30 ++++++++++------------ 1 file changed, 13 insertions(+), 17 deletions(-) (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch index f38e0669..6d0c6cbc 100644 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch +++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/open-model-zoo/0001-use-oe-gflags.patch @@ -1,33 +1,29 @@ -From 6a0046c523a67b4d21d856ea73861c00b5a9c9fd Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Mon, 19 Oct 2020 23:29:23 +0800 +From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001 +From: Naveen Saini +Date: Mon, 30 Aug 2021 17:54:17 +0800 Subject: [PATCH] demos: use gflags from meta-oe Upstream-Status: Inappropriate Signed-off-by: Anuj Mittal +Signed-off-by: Naveen Saini --- - demos/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + demos/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/demos/CMakeLists.txt b/demos/CMakeLists.txt -index c5e3b1ec3..4e78c72a6 100644 +index 1df8f248d..d368d608c 100644 --- a/demos/CMakeLists.txt +++ b/demos/CMakeLists.txt -@@ -62,11 +62,11 @@ set(CMAKE_CXX_STANDARD 11) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - #################################### - --set(GFLAGS_IS_SUBPROJECT TRUE) -+set(GFLAGS_IS_SUBPROJECT FALSE) - set(HAVE_SYS_STAT_H 1) - set(HAVE_INTTYPES_H 1) +@@ -131,7 +131,7 @@ find_package(OpenCV REQUIRED COMPONENTS core highgui videoio imgproc imgcodecs g + find_package(InferenceEngine REQUIRED) + find_package(ngraph REQUIRED) -add_subdirectory(thirdparty/gflags) +#add_subdirectory(thirdparty/gflags) + add_subdirectory(common/cpp) + add_subdirectory(multi_channel_common/cpp) - if(CMAKE_CXX_COMPILER_ID MATCHES "^GNU|(Apple)?Clang$") - set(COMPILER_IS_GCC_LIKE TRUE) -- -2.29.0 +2.17.1 -- cgit v1.2.3-54-g00ecf