diff options
author | Ray Molenkamp <github@lazydodo.com> | 2020-06-26 03:50:28 +0300 |
---|---|---|
committer | Ray Molenkamp <github@lazydodo.com> | 2020-06-26 03:50:28 +0300 |
commit | 2db4a81fe4af0a003e545b6834c038eb7b704744 (patch) | |
tree | ff8b0f7647ac3c2a58fadf5668387407b2acb103 /build_files/build_environment | |
parent | c9d94c2abaf2f6ebf8b95faab34b04e5ebfba520 (diff) |
deps: Fix build issue with USD on windows.
When doing a release build the TBB debug libs are not
set which was causing an error during the configure
phase of USD, so always set them even if not used.
Diffstat (limited to 'build_files/build_environment')
-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. |