From 8d85700e1020046470b78afe009ec4e7d6120935 Mon Sep 17 00:00:00 2001 From: sunyab Date: Mon, 30 Mar 2020 12:00:47 -0700 Subject: [PATCH] Update build_usd.py to use TBB 2017 Update 6 This conforms to the VFX Reference Platform CY2018 (Internal change: 2051645) --- VERSIONS.md | 2 +- build_scripts/build_usd.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/VERSIONS.md b/VERSIONS.md index e9a05561a2..993703984e 100644 --- a/VERSIONS.md +++ b/VERSIONS.md @@ -18,7 +18,7 @@ Our test machines have the following software versions installed | CMake | 3.14.6 | 3.16.5 | 3.16.5 | | Python | 2.7.5 | 2.7.5,2.71.0 | 2.7.5,2.7.12 | | Boost | 1.55 | 1.61.0 | 1.61.0 | -| Intel TBB | 4.4 Update 6 | 4.4 Update 6, 2017.0 | 4.4 Update 6, 2017.0 | +| Intel TBB | 2017 Update 6 | 2017 Update 6 | 2017 Update 6 | | OpenSubdiv | 3.0.5, 3.4 | 3.0.5, 3.1.1 | 3.1.1 | | GLEW | 2.0.0 | 2.0.0 | 2.0.0 | | OpenImageIO | 1.8.9 | 1.8.9 | 1.8.9 | diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py index 2d91ce9df8..43c11556ac 100644 --- a/build_scripts/build_usd.py +++ b/build_scripts/build_usd.py @@ -708,11 +708,9 @@ def InstallBoost(context, force, buildArgs): # Intel TBB if Windows(): - TBB_URL = "https://github.com/01org/tbb/releases/download/2017_U5/tbb2017_20170226oss_win.zip" -elif MacOS(): - TBB_URL = "https://github.com/01org/tbb/archive/2017_U2.tar.gz" + TBB_URL = "https://github.com/oneapi-src/oneTBB/releases/download/2017_U6/tbb2017_20170412oss_win.zip" else: - TBB_URL = "https://github.com/01org/tbb/archive/4.4.6.tar.gz" + TBB_URL = "https://github.com/oneapi-src/oneTBB/archive/2017_U6.tar.gz" def InstallTBB(context, force, buildArgs): if Windows():