1 files changed, 37 insertions, 43 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
index 9c91ac4d..52049eb0 100644
--- a/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
+++ b/dynamic-layers/openembedded-layer/recipes-support/opencv/files/0003-inference-engine-installation-fixes.patch
@@ -1,4 +1,4 @@
-From 5bec3199ec6fd8f784cd688159f768a732c9ad69 Mon Sep 17 00:00:00 2001
+From cb9a755218ff033c8c42e9dc46a845310a3331fa Mon Sep 17 00:00:00 2001
 From: Anuj Mittal <anuj.mittal@intel.com>
 Date: Thu, 11 Jun 2020 14:24:04 +0800
 Subject: [PATCH] cmake installation fixes
@@ -14,17 +14,17 @@ Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
  .../samples/common/format_reader/CMakeLists.txt    |  2 ++
  .../src/inference_engine/CMakeLists.txt            |  4 ++--
  .../src/vpu/myriad_plugin/CMakeLists.txt           |  2 +-
- inference-engine/tests/unit/cpu/CMakeLists.txt     |  4 +++-
+ inference-engine/tests/unit/cpu/CMakeLists.txt     |  2 ++
  .../tests/unit/inference_engine/CMakeLists.txt     |  2 ++
- inference-engine/tests/unit/vpu/CMakeLists.txt     |  4 +++-
+ inference-engine/tests/unit/vpu/CMakeLists.txt     |  2 ++
  inference-engine/tools/compile_tool/CMakeLists.txt |  2 +-
- 11 files changed, 25 insertions(+), 30 deletions(-)
+ 11 files changed, 23 insertions(+), 28 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 18ed02ee5..18f6094f3 100644
+index 5c3585a3e9..2b8c99f862 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -143,12 +143,8 @@ add_subdirectory(docs)
+@@ -176,12 +176,8 @@ ie_shellcheck_process(DIRECTORY "${OpenVINO_MAIN_SOURCE_DIR}"
  
  # install setupvars
  
@@ -37,7 +37,7 @@ index 18ed02ee5..18f6094f3 100644
  elseif(WIN32)
      install(PROGRAMS scripts/setupvars/setupvars.bat
              DESTINATION bin
-@@ -158,22 +154,12 @@ endif()
+@@ -191,22 +187,12 @@ endif()
  # install install_dependencies
  
  if(UNIX)
@@ -61,10 +61,10 @@ index 18ed02ee5..18f6094f3 100644
      install(DIRECTORY scripts/demo/
              DESTINATION deployment_tools/demo
 diff --git a/cmake/developer_package.cmake b/cmake/developer_package.cmake
-index 86137c384..af011c361 100644
+index cda7afd294..ec51636e96 100644
 --- a/cmake/developer_package.cmake
 +++ b/cmake/developer_package.cmake
-@@ -10,7 +10,9 @@ list(APPEND CMAKE_MODULE_PATH
+@@ -29,7 +29,9 @@ list(APPEND CMAKE_MODULE_PATH
  include(CPackComponent)
  unset(IE_CPACK_COMPONENTS_ALL CACHE)
  
@@ -75,18 +75,18 @@ index 86137c384..af011c361 100644
  
  # Search packages for the host system instead of packages for the target system
  # in case of cross compilation these macros should be defined by the toolchain file
-@@ -43,8 +45,8 @@ function(ie_cpack_set_library_dir)
-         set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
+@@ -55,8 +57,8 @@ function(ie_cpack_set_library_dir)
+         set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/bin/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
+         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER}/${CMAKE_BUILD_TYPE} PARENT_SCOPE)
      else()
--        set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
--        set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
+-        set(IE_CPACK_LIBRARY_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
+-        set(IE_CPACK_RUNTIME_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
 +        set(IE_CPACK_LIBRARY_PATH ${CMAKE_INSTALL_LIBDIR} PARENT_SCOPE)
-+       set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
-         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH} PARENT_SCOPE)
++        set(IE_CPACK_RUNTIME_PATH ${CMAKE_INSTALL_BINDIR} PARENT_SCOPE)
+         set(IE_CPACK_ARCHIVE_PATH ${IE_CPACK_IE_DIR}/lib/${ARCH_FOLDER} PARENT_SCOPE)
      endif()
  endfunction()
-@@ -147,7 +149,7 @@ endif()
+@@ -151,7 +153,7 @@ endif()
  
  # allow to override default OUTPUT_ROOT root
  if(NOT DEFINED OUTPUT_ROOT)
@@ -96,7 +96,7 @@ index 86137c384..af011c361 100644
  
  # Enable postfixes for Debug/Release builds
 diff --git a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
-index b8d5ddf62..d086478f6 100644
+index b8d5ddf622..d086478f6d 100644
 --- a/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
 +++ b/inference-engine/ie_bridges/c/samples/common/opencv_c_wraper/CMakeLists.txt
 @@ -29,3 +29,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER c_samples)
@@ -106,7 +106,7 @@ index b8d5ddf62..d086478f6 100644
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/inference-engine/samples/CMakeLists.txt b/inference-engine/samples/CMakeLists.txt
-index 4dda7eecd..04e1b9c3e 100644
+index 236c17e6af..22f410d1fd 100644
 --- a/inference-engine/samples/CMakeLists.txt
 +++ b/inference-engine/samples/CMakeLists.txt
 @@ -34,7 +34,7 @@ endif()
@@ -118,7 +118,7 @@ index 4dda7eecd..04e1b9c3e 100644
      # hint for find_package(InferenceEngine in the samples folder)
      set(InferenceEngine_DIR "${CMAKE_BINARY_DIR}")
      # hint for find_package(ngraph in the samples folder)
-@@ -122,11 +122,6 @@ set (HAVE_INTTYPES_H 1)
+@@ -118,11 +118,6 @@ set (HAVE_INTTYPES_H 1)
  set (INTTYPES_FORMAT C99)
  set (BUILD_TESTING OFF)
  
@@ -130,7 +130,7 @@ index 4dda7eecd..04e1b9c3e 100644
  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
  endif()
-@@ -250,6 +245,8 @@ macro(ie_add_sample)
+@@ -245,6 +240,8 @@ macro(ie_add_sample)
          add_cpplint_target(${IE_SAMPLE_NAME}_cpplint FOR_TARGETS ${IE_SAMPLE_NAME}
                             CUSTOM_FILTERS ${custom_filters})
      endif()
@@ -140,7 +140,7 @@ index 4dda7eecd..04e1b9c3e 100644
  
  # collect all samples subdirectories
 diff --git a/inference-engine/samples/common/format_reader/CMakeLists.txt b/inference-engine/samples/common/format_reader/CMakeLists.txt
-index 48dbed9f2..76532fd04 100644
+index 48dbed9f2b..76532fd047 100644
 --- a/inference-engine/samples/common/format_reader/CMakeLists.txt
 +++ b/inference-engine/samples/common/format_reader/CMakeLists.txt
 @@ -41,3 +41,5 @@ target_include_directories(${TARGET_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -150,10 +150,10 @@ index 48dbed9f2..76532fd04 100644
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_LIBDIR})
 diff --git a/inference-engine/src/inference_engine/CMakeLists.txt b/inference-engine/src/inference_engine/CMakeLists.txt
-index 105e666a3..5c2f70575 100644
+index 3bba22215e..b6f6b7b203 100644
 --- a/inference-engine/src/inference_engine/CMakeLists.txt
 +++ b/inference-engine/src/inference_engine/CMakeLists.txt
-@@ -244,8 +244,8 @@ install(TARGETS ${TARGET_NAME}
+@@ -229,8 +229,8 @@ install(TARGETS ${TARGET_NAME}
  install(FILES "${OpenVINO_BINARY_DIR}/share/ie_parallel.cmake"
                "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig.cmake"
                "${OpenVINO_BINARY_DIR}/share/InferenceEngineConfig-version.cmake"
@@ -165,10 +165,10 @@ index 105e666a3..5c2f70575 100644
 +       DESTINATION ${CMAKE_INSTALL_LIBDIR}
          COMPONENT core)
 diff --git a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-index aeebe4e04..310eb6231 100644
+index 889f2e6e66..67de9c3a32 100644
 --- a/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
 +++ b/inference-engine/src/vpu/myriad_plugin/CMakeLists.txt
-@@ -48,5 +48,5 @@ target_link_libraries(${TARGET_NAME}
+@@ -50,5 +50,5 @@ set_target_properties(${TARGET_NAME} PROPERTIES INTERPROCEDURAL_OPTIMIZATION_REL
  # install
  
  install(FILES ${IE_MAIN_SOURCE_DIR}/thirdparty/movidius/mvnc/src/97-myriad-usbboot.rules
@@ -176,20 +176,17 @@ index aeebe4e04..310eb6231 100644
 +        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/udev/rules.d
          COMPONENT myriad)
 diff --git a/inference-engine/tests/unit/cpu/CMakeLists.txt b/inference-engine/tests/unit/cpu/CMakeLists.txt
-index d7acf8908..be4ae4a76 100644
+index c9a92b4857..2b4fcc4d01 100644
 --- a/inference-engine/tests/unit/cpu/CMakeLists.txt
 +++ b/inference-engine/tests/unit/cpu/CMakeLists.txt
-@@ -24,4 +24,6 @@ addIeTargetTest(
-         ADD_CPPLINT
-         LABELS
-             CPU
--)
-\ No newline at end of file
-+)
+@@ -25,3 +25,5 @@ addIeTargetTest(
+ ie_faster_build(${TARGET_NAME}
+     UNITY
+ )
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 diff --git a/inference-engine/tests/unit/inference_engine/CMakeLists.txt b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
-index e4613f032..5fe9e7089 100644
+index 76cc67cca1..04ff11cc05 100644
 --- a/inference-engine/tests/unit/inference_engine/CMakeLists.txt
 +++ b/inference-engine/tests/unit/inference_engine/CMakeLists.txt
 @@ -26,3 +26,5 @@ addIeTargetTest(
@@ -199,20 +196,17 @@ index e4613f032..5fe9e7089 100644
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 diff --git a/inference-engine/tests/unit/vpu/CMakeLists.txt b/inference-engine/tests/unit/vpu/CMakeLists.txt
-index a4106753d..091339e17 100644
+index 215562f2af..215ec9f4fb 100644
 --- a/inference-engine/tests/unit/vpu/CMakeLists.txt
 +++ b/inference-engine/tests/unit/vpu/CMakeLists.txt
-@@ -27,4 +27,6 @@ addIeTargetTest(
-         LABELS
+@@ -35,3 +35,5 @@ addIeTargetTest(
              VPU
              MYRIAD
--)
-\ No newline at end of file
-+)
+ )
 +
 +install(TARGETS ${TARGET_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
 diff --git a/inference-engine/tools/compile_tool/CMakeLists.txt b/inference-engine/tools/compile_tool/CMakeLists.txt
-index 58614d3ce..9dfa068e4 100644
+index 58614d3ced..9dfa068e4d 100644
 --- a/inference-engine/tools/compile_tool/CMakeLists.txt
 +++ b/inference-engine/tools/compile_tool/CMakeLists.txt
 @@ -49,7 +49,7 @@ add_cpplint_target(${TARGET_NAME}_cpplint FOR_TARGETS ${TARGET_NAME})
@@ -225,5 +219,5 @@ index 58614d3ce..9dfa068e4 100644
  
  install(FILES README.md
 -- 
-2.26.2
+2.29.2