Fix install of static TBB libs (openvinotoolkit#13012)

In case of "Downloaded TBB" after second call of `cmake` it treats TBB as custom instead of downloaded, and doesn't install static libs correct way
kwende · Sep 13, 2022 · 6e816b6 · 6e816b6
1 parent a73fc2d
commit 6e816b6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
@@ -142,8 +142,6 @@ function(ov_download_tbb)
     debug_message(STATUS "tbb=" ${TBB})
     debug_message(STATUS "tbb_dir=" ${TBB_DIR})
     debug_message(STATUS "tbbroot=" ${TBBROOT})
-
-    set(TBB "${TBB}" PARENT_SCOPE)
 endfunction()
 
 ## TBBBind_2_5 package
@@ -159,7 +157,7 @@ function(ov_download_tbbbind_2_5)
     endif()
     set(_ov_download_tbbbind_2_5_done ON CACHE BOOL "Whether prebuilt TBBBind_2_5 is already downloaded")
 
-    reset_deps_cache(TBBBIND_2_5_DIR)
+    reset_deps_cache(TBBBIND_2_5_ROOT TBBBIND_2_5_DIR)
 
     if(DEFINED ENV{THIRDPARTY_SERVER_PATH})
         set(IE_PATH_TO_DEPS "$ENV{THIRDPARTY_SERVER_PATH}")
@@ -185,9 +183,8 @@ Build oneTBB from sources and set TBBROOT environment var before OpenVINO cmake
         return()
     endif()
 
+    update_deps_cache(TBBBIND_2_5_ROOT "${TBBBIND_2_5}" "Path to TBBBIND_2_5 root folder")
     update_deps_cache(TBBBIND_2_5_DIR "${TBBBIND_2_5}/cmake" "Path to TBBBIND_2_5 cmake folder")
-
-    set(TBBBIND_2_5 "${TBBBIND_2_5}" PARENT_SCOPE)
 endfunction()
 
 ## OpenCV

diff --git a/src/cmake/install_tbb.cmake b/src/cmake/install_tbb.cmake
@@ -78,13 +78,12 @@ endif()
 # - custom TBB provided by users, needs to be a part of wheel packages
 # - system TBB also needs to be a part of wheel packages
 if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
-       ( (DEFINED TBB AND TBB MATCHES ${TEMP}) OR
+       ( (DEFINED TBBROOT AND TBBROOT MATCHES ${TEMP}) OR
          (DEFINED TBBROOT OR DEFINED TBB_DIR OR DEFINED ENV{TBBROOT} OR
           DEFINED ENV{TBB_DIR}) OR ENABLE_SYSTEM_TBB ) )
     ie_cpack_add_component(tbb HIDDEN)
     list(APPEND core_components tbb)
-
-    if(TBB MATCHES ${TEMP})
+    if(TBBROOT MATCHES ${TEMP})
         set(tbb_downloaded ON)
     elseif(DEFINED ENV{TBBROOT} OR DEFINED ENV{TBB_DIR} OR
            DEFINED TBBROOT OR DEFINED TBB_DIR)
@@ -185,16 +184,16 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
         set(IE_TBB_DIR_INSTALL "runtime/3rdparty/tbb/")
 
         if(WIN32)
-            install(DIRECTORY "${TBB}/bin"
+            install(DIRECTORY "${TBBROOT}/bin"
                     DESTINATION "${IE_TBB_DIR_INSTALL}"
                     COMPONENT tbb)
         else()
-            install(DIRECTORY "${TBB}/lib"
+            install(DIRECTORY "${TBBROOT}/lib"
                     DESTINATION "${IE_TBB_DIR_INSTALL}"
                     COMPONENT tbb)
         endif()
 
-        install(FILES "${TBB}/LICENSE"
+        install(FILES "${TBBROOT}/LICENSE"
                 DESTINATION "${IE_TBB_DIR_INSTALL}"
                 COMPONENT tbb)
 
@@ -205,17 +204,17 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
                                DEPENDS tbb)
         list(APPEND core_dev_components tbb_dev)
 
-        install(FILES "${TBB}/cmake/TBBConfig.cmake"
-                      "${TBB}/cmake/TBBConfigVersion.cmake"
+        install(FILES "${TBBROOT}/cmake/TBBConfig.cmake"
+                      "${TBBROOT}/cmake/TBBConfigVersion.cmake"
                 DESTINATION "${IE_TBB_DIR_INSTALL}/cmake"
                 COMPONENT tbb_dev)
-        install(DIRECTORY "${TBB}/include"
+        install(DIRECTORY "${TBBROOT}/include"
                 DESTINATION "${IE_TBB_DIR_INSTALL}"
                 COMPONENT tbb_dev)
 
         if(WIN32)
             # .lib files are needed only for Windows
-            install(DIRECTORY "${TBB}/lib"
+            install(DIRECTORY "${TBBROOT}/lib"
                     DESTINATION "${IE_TBB_DIR_INSTALL}"
                     COMPONENT tbb_dev)
         endif()
@@ -233,14 +232,14 @@ endif()
 if(install_tbbbind)
     set(IE_TBBBIND_DIR_INSTALL "runtime/3rdparty/tbb_bind_2_5")
 
-    install(DIRECTORY "${TBBBIND_2_5}/lib"
+    install(DIRECTORY "${TBBBIND_2_5_ROOT}/lib"
             DESTINATION "${IE_TBBBIND_DIR_INSTALL}"
             COMPONENT tbb)
-    install(FILES "${TBBBIND_2_5}/LICENSE"
+    install(FILES "${TBBBIND_2_5_ROOT}/LICENSE"
             DESTINATION "${IE_TBBBIND_DIR_INSTALL}"
             COMPONENT tbb)
 
-    install(FILES "${TBBBIND_2_5}/cmake/TBBBIND_2_5Config.cmake"
+    install(FILES "${TBBBIND_2_5_ROOT}/cmake/TBBBIND_2_5Config.cmake"
             DESTINATION "${IE_TBBBIND_DIR_INSTALL}/cmake"
             COMPONENT tbb_dev)
 endif()