Page MenuHome
Differential D14334

CMake: prepare USD build & find scripts for USD >= 21.11
ClosedPublic
Actions

Authored by Sybren A. Stüvel (sybren) on Mar 14 2022, 12:39 PM.

Details

Reviewers
Ray Molenkamp (LazyDodo)
Brecht Van Lommel (brecht)
Bastien Montagne (mont29)
Commits
rBc1909770e7f1: CMake: prep USD build & find scripts for USD >= 21.11
Summary

Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a". This commit adjusts our usd.cmake (for building USD) and FindUSD.cmake (for finding the USD libraries) so that they work with and without this usd_ prefix.

Only tested on Linux, not on macOS/Windows.

See for more info: https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01

Diff Detail

Repository
rB Blender
Branch
usd-2203-prepare
Build Status
Buildable 21020
Build 21020: arc lint + arc unit

Event Timeline

Sybren A. Stüvel (sybren) requested review of this revision.Mar 14 2022, 12:39 PM
Sybren A. Stüvel (sybren) created this revision.
Harbormaster completed remote builds in B21020: Diff 49242.Mar 14 2022, 12:39 PM
Brecht Van Lommel (brecht) accepted this revision.Mar 14 2022, 12:47 PM
This revision is now accepted and ready to land.Mar 14 2022, 12:47 PM
Brecht Van Lommel (brecht) added 1 blocking reviewer(s): Ray Molenkamp (LazyDodo).Mar 14 2022, 12:48 PM
This revision now requires review to proceed.Mar 14 2022, 12:48 PM
Ray Molenkamp (LazyDodo) accepted this revision.Mar 14 2022, 5:26 PM
This revision is now accepted and ready to land.Mar 14 2022, 5:26 PM
Bastien Montagne (mont29) accepted this revision.Mar 15 2022, 10:10 AM
Closed by commit rBc1909770e7f1: CMake: prep USD build & find scripts for USD >= 21.11 (authored by Sybren A. Stüvel (sybren)). · Explain WhyMar 22 2022, 10:57 AM
This revision was automatically updated to reflect the committed changes.
Sybren A. Stüvel (sybren) added a commit: rBc1909770e7f1: CMake: prep USD build & find scripts for USD >= 21.11.

Revision Contents
Changeset List

PathSize
build_files/
build_environment/
cmake/
14 lines
cmake/
Modules/
4 lines

Diff 49242

View Options

build_files/build_environment/cmake/usd.cmake

Loading...
View Options

build_files/cmake/Modules/FindUSD.cmake

Loading...