Skip to content

Commit fe9072d

Browse files
authored
add oneTBB pdb files installation (#29282)
### Details: - *add oneTBB pdb files installation* ### Tickets: - *162921*
1 parent b274da8 commit fe9072d

File tree

2 files changed

+21
-8
lines changed

2 files changed

+21
-8
lines changed

cmake/dependencies.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ function(ov_download_tbb)
101101
# TODO: add target_path to be platform specific as well, to avoid following if
102102
# build oneTBB 2021.2.1 with Visual Studio 2019 (MSVC 14.21)
103103
RESOLVE_DEPENDENCY(TBB
104-
ARCHIVE_WIN "oneapi-tbb-2021.2.5-win-trim-cfg-simplify.zip"
104+
ARCHIVE_WIN "oneapi-tbb-2021.2.5-win-pdb.zip"
105105
TARGET_PATH "${TEMP}/tbb"
106106
ENVIRONMENT "TBBROOT"
107-
SHA256 "63bf0992406d69dfb3c402f46466face2388ca55b6678f29072ba304f3622fe7"
107+
SHA256 "8acb2bd35769aac20597bc0ce1f7608e993b48dee18ee1cc144a05406b6b2613"
108108
USE_NEW_LOCATION TRUE)
109109
elseif(ANDROID AND X86_64)
110110
RESOLVE_DEPENDENCY(TBB

src/cmake/install_tbb.cmake

+19-6
Original file line numberDiff line numberDiff line change
@@ -212,12 +212,18 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
212212
list(APPEND core_dev_components tbb_dev)
213213

214214
if(WIN32)
215-
# .lib files are needed only for Windows
216-
install(DIRECTORY "${TBBROOT}/lib"
217-
DESTINATION "${OV_TBBROOT_INSTALL}"
218-
COMPONENT tbb_dev
219-
${OV_CPACK_COMP_TBB_DEV_EXCLUDE_ALL}
220-
PATTERN "cmake" EXCLUDE)
215+
# .lib files are needed only for Windows
216+
install(DIRECTORY "${TBBROOT}/lib"
217+
DESTINATION "${OV_TBBROOT_INSTALL}"
218+
COMPONENT tbb_dev
219+
${OV_CPACK_COMP_TBB_DEV_EXCLUDE_ALL}
220+
PATTERN "cmake" EXCLUDE)
221+
# .pdb files are needed only for Windows
222+
install(DIRECTORY "${TBBROOT}/${tbb_libs_dir}/"
223+
DESTINATION "${OV_TBBROOT_INSTALL}/${tbb_libs_dir}"
224+
COMPONENT pdb
225+
EXCLUDE_FROM_ALL
226+
FILES_MATCHING PATTERN "*.pdb")
221227
endif()
222228

223229
set(TBB_LIB_INSTALL_DIR "${OV_TBBROOT_INSTALL}/${tbb_libs_dir}" CACHE PATH "TBB library install directory" FORCE)
@@ -227,6 +233,7 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
227233

228234
if(WIN32)
229235
set(_ov_tbb_libs_path "${TBBROOT}/bin")
236+
set(ov_tbb_exclude PATTERN "*.pdb" EXCLUDE)
230237
else()
231238
set(_ov_tbb_libs_path "${TBBROOT}/lib")
232239
set(ov_tbb_exclude PATTERN "cmake" EXCLUDE)
@@ -289,6 +296,12 @@ if(THREADING MATCHES "^(TBB|TBB_AUTO)$" AND
289296
COMPONENT tbb_dev
290297
${OV_CPACK_COMP_TBB_DEV_EXCLUDE_ALL}
291298
PATTERN "cmake" EXCLUDE)
299+
# .pdb files are needed only for Windows
300+
install(DIRECTORY "${_ov_tbb_libs_path}"
301+
DESTINATION "${OV_TBB_DIR_INSTALL}"
302+
COMPONENT pdb
303+
EXCLUDE_FROM_ALL
304+
FILES_MATCHING PATTERN "*.pdb")
292305
endif()
293306

294307
set(TBB_LIB_INSTALL_DIR "${OV_TBB_DIR_INSTALL}/${lib_subfolder}" CACHE PATH "TBB library install directory" FORCE)

0 commit comments

Comments
 (0)