From 90b225ce8a00aafd94d0aef5f85e73adce91d5f2 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 27 Sep 2019 22:55:27 +0800 Subject: dldt-inference-engine: upgrade 2019r1.1 -> 2019r2 * Release notes: https://software.intel.com/en-us/articles/OpenVINO-RelNotes * Enable unit tests to be built and tested using ptest mechanism. * Include patches from Clear Linux for build fixes. * Switch to using python3 and threading to using TBB. Switch ENABLE_OPENCV to off so opencv from system is used. * Remove do_install and patch Makefiles instead to install libraries correctly. Signed-off-by: Anuj Mittal --- .../0002-use-ade-and-pugixml-from-system.patch | 32 ---------------------- 1 file changed, 32 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch deleted file mode 100644 index 8af9527e..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0002-use-ade-and-pugixml-from-system.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6e225e85d5763e883128ee7b8a97ac247c46b465 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 20 Aug 2019 12:40:09 +0800 -Subject: [PATCH] use ade and pugixml from system - -Don't build a local copy and use the one from sysroot. - -Upstream-Status: Submitted - -Signed-off-by: Anuj Mittal ---- - inference-engine/thirdparty/CMakeLists.txt | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/inference-engine/thirdparty/CMakeLists.txt b/inference-engine/thirdparty/CMakeLists.txt -index f65f38c..7f23e8f 100644 ---- a/inference-engine/thirdparty/CMakeLists.txt -+++ b/inference-engine/thirdparty/CMakeLists.txt -@@ -7,11 +7,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CC_FLAGS "${CMAKE_CC_FLAGS} -Wno-unknown-warning-option -Wno-inconsistent-missing-override -Wno-pass-failed") - endif() - --add_subdirectory(pugixml) --export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") -+# add_subdirectory(pugixml) -+# export(TARGETS pugixml NAMESPACE IE:: APPEND FILE "${CMAKE_BINARY_DIR}/targets.cmake") - - add_subdirectory(stb_lib) --add_subdirectory(ade) - - if (ENABLE_CLDNN) - set(CLDNN__OUTPUT_BIN_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) -- cgit v1.2.3-54-g00ecf