Skip to content

Commit

Permalink
Add tbb as a submodule and update to version 2022.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Molter73 committed Nov 4, 2024
1 parent bb8af31 commit 4d419ea
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 8 deletions.
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -64,3 +64,7 @@
path = builder/third_party/c-ares
url = https://github.com/c-ares/c-ares.git
branch = main
[submodule "builder/third_party/tbb"]
path = builder/third_party/tbb
url = https://github.com/oneapi-src/oneTBB.git
branch = master
16 changes: 9 additions & 7 deletions builder/install/60-tbb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@ if [ -n "${WITH_RHEL_RPMS}" ]; then
exit 0
fi

git clone --branch "$TBB_VERSION" --depth 1 https://github.com/intel/tbb
cd tbb
cp LICENSE "${LICENSE_DIR}/tbb-${TBB_VERSION}"
make ${NPROCS:+-j ${NPROCS}} tbb_build_dir=./build tbb_build_prefix=lib extra_inc=big_iron.inc
mkdir -p /usr/local/include
cp -r ./include/tbb /usr/local/include/
cp ./build/lib_release/libtbb.a /usr/local/lib/
cd third_party/tbb
cp LICENSE.txt "${LICENSE_DIR}/tbb-${TBB_VERSION}"
cmake -B cmake-build -S . \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DBUILD_SHARED_LIBS=OFF \
-DTBB_TEST=OFF \
-DTBBMALLOC_BUILD=OFF
cmake --build cmake-build --target install ${NPROCS:+-j ${NPROCS}}
2 changes: 1 addition & 1 deletion builder/install/versions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export GRPC_REVISION=v1.67.0
export JSONCPP_REVISION=0.10.7
export PROMETHEUS_CPP_REVISION=v0.9.0
export PROTOBUF_VERSION=v28.3
export TBB_VERSION=2018_U5
export TBB_VERSION=2022.0.0
export CIVETWEB_VERSION=v1.15
export ABSEIL_VERSION=20240722.0
export VALIJSON_VERSION=0.6
Expand Down
1 change: 1 addition & 0 deletions builder/third_party/tbb
Submodule tbb added at 0c0ff1

0 comments on commit 4d419ea

Please sign in to comment.