Restore compilaltion with tbb 2017u7

Signed-off-by: Alexander Peskov <[email protected]>
openvinotoolkit · Nov 6, 2020 · c97888d · c97888d
1 parent d622c08
commit c97888d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/inference-engine/cmake/ie_parallel.cmake b/inference-engine/cmake/ie_parallel.cmake
@@ -7,6 +7,7 @@ function(set_ie_threading_interface_for TARGET_NAME)
         find_package(TBB COMPONENTS tbb tbbmalloc)
         set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
         set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
+        set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
         if (TBB_FOUND)
             if (TBB_VERSION VERSION_LESS 2020)
                 ext_message(WARNING "TBB version is less than OpenVINO recommends to use.\

diff --git a/inference-engine/tests/functional/inference_engine/CMakeLists.txt b/inference-engine/tests/functional/inference_engine/CMakeLists.txt
@@ -146,6 +146,13 @@ function(ie_headers_compilation_with_custom_flags)
     # To include TBB headers as system
     set_ie_threading_interface_for(${target_name})
 
+    # To avoid further TBB find_package action in next call of this function. Some version of TBB
+    # has an issue with cmake config which lead to fail in case of multiple call of find_package
+    # from one cmake script file.
+    set("TBB_FOUND" ${TBB_FOUND} PARENT_SCOPE)
+    set("TBB_IMPORTED_TARGETS" ${TBB_IMPORTED_TARGETS} PARENT_SCOPE)
+    set("TBB_VERSION" ${TBB_VERSION} PARENT_SCOPE)
+
     set_target_properties(${target_name} PROPERTIES
                           CXX_STANDARD ${IE_TEST_CXX_STANDARD}
                           CXX_STANDARD_REQUIRED OFF)