open-model-zoo: upgrade 2021.3 -> 2021.4

https://github.com/openvinotoolkit/open_model_zoo/releases/tag/2021.4

Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Naveen Saini 2021-09-01 09:18:02 +08:00 committed by Anuj Mittal
parent a9c7df9131
commit bfc685697d
2 changed files with 14 additions and 18 deletions

View File

@ -1,33 +1,29 @@
From 6a0046c523a67b4d21d856ea73861c00b5a9c9fd Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 19 Oct 2020 23:29:23 +0800
From 247a5383e7ae444fd99022a19fe90a59dbedbc98 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
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 <anuj.mittal@intel.com>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
---
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

View File

@ -8,7 +8,7 @@ SRC_URI = "git://github.com/opencv/open_model_zoo.git;protocol=git;branch=master
file://0001-use-oe-gflags.patch \
"
SRCREV = "9ca5dbeff80464bf5728e8be25daedfe9a9208d7"
SRCREV = "e37a163a2385d9ddaa8e3da1ccb50c80d4fa0802"
LICENSE = "Apache-2.0"
LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \