diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2022-03-22 12:56:21 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2022-03-22 12:56:21 +0300 |
| commit | c1909770e7f192574ea62449dd14b4254637e604 (patch) | |
| tree | 8a89bd9c69fe21d78b889dfdb163f4c22c17671d /build_files/cmake/Modules/FindUSD.cmake | |
| parent | 47451af027e247b82a5e990393c4101a0178bbdc (diff) | |
CMake: prep USD build & find scripts for USD >= 21.11
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.
See for more info:
https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01
Reviewed By: LazyDodo, brecht, mont29
Differential Revision: https://developer.blender.org/D14334
Diffstat (limited to 'build_files/cmake/Modules/FindUSD.cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindUSD.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/build_files/cmake/Modules/FindUSD.cmake b/build_files/cmake/Modules/FindUSD.cmake index 840fa2d538f..a5370fe24b3 100644 --- a/build_files/cmake/Modules/FindUSD.cmake +++ b/build_files/cmake/Modules/FindUSD.cmake @@ -32,9 +32,11 @@ FIND_PATH(USD_INCLUDE_DIR DOC "Universal Scene Description (USD) header files" ) +# Since USD 21.11 the libraries are prefixed with "usd_", i.e. "libusd_m.a" became "libusd_usd_m.a". +# See https://github.com/PixarAnimationStudios/USD/blob/release/CHANGELOG.md#2111---2021-11-01 FIND_LIBRARY(USD_LIBRARY NAMES - usd_m usd_ms + usd_usd_m usd_usd_ms usd_m usd_ms NAMES_PER_DIR HINTS ${_usd_SEARCH_DIRS} |