Skip to content

Commit 92bceb4

Browse files
Disabled TBB component
Signed-off-by: Meet Gandhi <[email protected]>
1 parent 24b735f commit 92bceb4

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

3rdparty/mkl/tbb.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,9 @@ set(_build_shared_libs ${BUILD_SHARED_LIBS})
1414
set(BUILD_SHARED_LIBS ON)
1515
set(_win_exp_all_syms ${CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS})
1616
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS OFF) # ON interferes with TBB symbols
17-
set(TBB_VERSION "2021.12.0")
1817
FetchContent_Declare(
1918
ext_tbb
20-
URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${TBB_VERSION}.tar.gz # April 2024
19+
URL https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.12.0.tar.gz # April 2024
2120
URL_HASH SHA256=c7bb7aa69c254d91b8f0041a71c5bcc3936acb64408a1719aec0b2b7639dd84f
2221
DOWNLOAD_DIR "${OPEN3D_THIRD_PARTY_DOWNLOAD_DIR}/tbb"
2322
)

cmake/Open3DPackaging.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ if (EXISTS ${DPKG_PROGRAM})
3838
list(APPEND CPACK_GENERATOR DEB)
3939
set(CPACK_SET_DESTDIR ON)
4040
set(CPACK_INSTALL_PREFIX /usr/local)
41+
set(CPACK_COMPONENTS_ALL "dev")
4142
set(CPACK_DEBIAN_DEV_PACKAGE_NAME "open3d-devel-${_sys}")
4243
set(CPACK_DEBIAN_PACKAGE_VERSION ${OPEN3D_VERSION_FULL})
4344
execute_process(COMMAND ${DPKG_PROGRAM} --print-architecture
4445
OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
4546
OUTPUT_STRIP_TRAILING_WHITESPACE)
4647
set(CPACK_DEBIAN_FILE_NAME DEB-DEFAULT)
47-
set(CPACK_DEBIAN_TBB_FILE_NAME "libtbb12_${TBB_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}.deb")
4848
set(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
4949
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
5050
set(CPACK_DEB_COMPONENT_INSTALL ON)

0 commit comments

Comments
 (0)