Skip to content

Commit

Permalink
Update build_usd.py to use TBB 2017 Update 6
Browse files Browse the repository at this point in the history
This conforms to the VFX Reference Platform CY2018

(Internal change: 2051645)
  • Loading branch information
sunyab authored and pixar-oss committed Mar 30, 2020
1 parent 61c0316 commit 8d85700
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
6 changes: 2 additions & 4 deletions build_scripts/build_usd.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down

0 comments on commit 8d85700

Please sign in to comment.