System TBB

cmake/templates/OpenVINOConfig.cmake.in

@@ -148,7 +148,7 @@ set(_ov_package_prefix_dir "${PACKAGE_PREFIX_DIR}")
 set(THREADING "@THREADING@")
 # TODO: find system TBB instead of custom one
 if((THREADING STREQUAL "TBB" OR THREADING STREQUAL "TBB_AUTO") AND NOT TBB_FOUND)
-    set(ov_system_tbb "@ov_system_tbb@")
+    set(ov_system_tbb "@ENABLE_SYSTEM_TBB@")
     if(ov_system_tbb)
         # OpenVINO is built against system TBB
         _ov_find_dependency(TBB

src/cmake/install_tbb.cmake

@@ -21,14 +21,6 @@ endif()
 if(THREADING MATCHES "^(TBB|TBB_AUTO)$")
     set(IE_TBB_DIR "${TBB_DIR}")
     list(APPEND PATH_VARS "IE_TBB_DIR")
-
-    # check whether we are building against system TBB
-    if(NOT TBBROOT MATCHES ${TEMP})
-        set(ov_system_tbb ON)
-        # set IE_TBB_DIR to "" as a hint for OpenVINOConfig.cmake that
-        # TBB needs to be searched on the system
-        set(IE_TBB_DIR "")
-    endif()
 endif()
 
 if(install_tbbbind)
@@ -37,7 +29,7 @@ if(install_tbbbind)
 endif()
 
 # install only downloaded TBB, system one is not installed
-if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND NOT ov_system_tbb)
+if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND TBBROOT MATCHES ${TEMP})
     ie_cpack_add_component(tbb REQUIRED)
     ie_cpack_add_component(tbb_dev REQUIRED)
     list(APPEND core_components tbb)