diff options
| author | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2020-07-01 18:13:57 +0300 |
| commit | 0829cebeb024095c268f190c34daa8ae9a5a224c (patch) | |
| tree | 12ee5a4a1c2a32e12eff47c8eb9bb0ed217791c1 /build_files/build_environment/cmake/usd.cmake | |
| parent | cfde6ebf450594faa57c4bfeaecff10fe512c91b (diff) | |
| parent | 42be3964eb201180f6b0fa1ff6ce43b8c3845bc2 (diff) | |
Merge branch 'master' into asset-uuid--archivedasset-uuid--archived
Diffstat (limited to 'build_files/build_environment/cmake/usd.cmake')
| -rw-r--r-- | build_files/build_environment/cmake/usd.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake index c98a9cae959..5fa1872cabc 100644 --- a/build_files/build_environment/cmake/usd.cmake +++ b/build_files/build_environment/cmake/usd.cmake @@ -27,6 +27,9 @@ set(USD_EXTRA_ARGS -DTBB_INCLUDE_DIRS=${LIBDIR}/tbb/include -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT} -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT} + # USD wants the tbb debug lib set even when you are doing a release build + # Otherwise it will error out during the cmake configure phase. + -DTBB_LIBRARIES_DEBUG=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${LIBEXT} # This is a preventative measure that avoids possible conflicts when add-ons # try to load another USD library into the same process space. |