Page MenuHome
Differential D6478

USD: Install USD library via install_deps.sh
ClosedPublic
Actions

Authored by Sybren A. Stüvel (sybren) on Dec 24 2019, 12:34 PM.

Details

Reviewers
Bastien Montagne (mont29)
Ray Molenkamp (LazyDodo)
Commits
rBec116e3d4925: USD: Install USD library via install_deps.sh
Summary

This commit adds the download, extract, patch, build, and install of the Universal Scene Description (USD) library to the install_deps.sh script.

It also changes where $BUILDTOOL install will try and find the USD JSON files. The new method uses ${USD_LIBRARY_DIR}, which should be correct in all cases.

Adding @Ray Molenkamp (LazyDodo) as reviewer to look at the use of ${USD_LIBRARY_DIR} to find the JSON files on Windows.

Diff Detail

Repository
rB Blender
Branch
arcpatch-D6478 (branched from master)
Build Status
Buildable 6107
Build 6107: arc lint + arc unit

Event Timeline

Sybren A. Stüvel (sybren) created this revision.Dec 24 2019, 12:34 PM
Harbormaster completed remote builds in B6106: Diff 20481.Dec 24 2019, 12:34 PM
Ray Molenkamp (LazyDodo) updated this revision to Diff 20486.Dec 24 2019, 7:32 PM
  • Updates for windows.
Harbormaster completed remote builds in B6107: Diff 20486.Dec 24 2019, 7:32 PM
Ray Molenkamp (LazyDodo) accepted this revision.Dec 24 2019, 7:33 PM

small changes were needed, updated the diff for you, beyond that lgtm on windows.

This revision is now accepted and ready to land.Dec 24 2019, 7:33 PM
Sybren A. Stüvel (sybren) added a comment.Dec 24 2019, 8:21 PM

@Ray Molenkamp (LazyDodo) thanks!

Bastien Montagne (mont29) accepted this revision.Dec 26 2019, 4:22 PM

Didn’t try code itself, but looks fine from quick check (besides copy/paste error noted below ;) ).

build_files/build_environment/install_deps.sh
2458

USD, not Alembic ;)

Sybren A. Stüvel (sybren) updated this revision to Diff 21571.Feb 10 2020, 2:52 PM
  • Rebased on top of current master
  • Copy/Paste error fix
Harbormaster completed remote builds in B6559: Diff 21571.Feb 10 2020, 2:52 PM
Closed by commit rBec116e3d4925: USD: Install USD library via install_deps.sh (authored by Sybren A. Stüvel (sybren)). · Explain WhyFeb 10 2020, 3:15 PM
This revision was automatically updated to reflect the committed changes.
Sybren A. Stüvel (sybren) added a commit: rBec116e3d4925: USD: Install USD library via install_deps.sh.

Revision Contents
Changeset List

PathSize
build_files/
build_environment/
155 lines
cmake/
Modules/
2 lines
platform/
5 lines
source/
creator/
2 lines

Diff 20486

View Options

build_files/build_environment/install_deps.sh

Loading...
View Options

build_files/cmake/Modules/FindUSD.cmake

Loading...
View Options

build_files/cmake/platform/platform_win32.cmake

Loading...
View Options

source/creator/CMakeLists.txt

Loading...