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 --- .../opencv/files/0001-use-provided-paths.patch | 33 ---------------------- 1 file changed, 33 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch (limited to 'dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch') diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch deleted file mode 100644 index d20ea111..00000000 --- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0001-use-provided-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3700b244d0906f339f33bcdbfc198f3ba97bf1a0 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Tue, 20 Aug 2019 15:58:04 +0800 -Subject: [PATCH] use provided paths - -Use the CMake paths provided by environment instead of hardcoding them here. - -Upstream-Status: Pending -Signed-off-by: Anuj Mittal - ---- - inference-engine/CMakeLists.txt | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/inference-engine/CMakeLists.txt b/inference-engine/CMakeLists.txt -index 1c3d6ea..9e15382 100644 ---- a/inference-engine/CMakeLists.txt -+++ b/inference-engine/CMakeLists.txt -@@ -99,14 +99,6 @@ if(NOT(UNIX)) - set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) - set (LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}) - set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}) # compatibility issue: linux uses LIBRARY_OUTPUT_PATH, windows uses LIBRARY_OUTPUT_DIRECTORY --else () -- set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -- set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -- set (CMAKE_COMPILE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -- set (CMAKE_PDB_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -- set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}) -- set (LIBRARY_OUTPUT_DIRECTORY ${OUTPUT_ROOT}/${BIN_FOLDER}/${IE_BUILD_CONFIGURATION}/lib) -- set (LIBRARY_OUTPUT_PATH ${LIBRARY_OUTPUT_DIRECTORY}/lib) - endif() - - if (APPLE) -- cgit v1.2.3-54-g00ecf