[Bf-blender-cvs] [2db4a81fe4a] master: deps: Fix build issue with USD on windows.
Ray Molenkamp
noreply at git.blender.org
Fri Jun 26 02:50:36 CEST 2020
Commit: 2db4a81fe4af0a003e545b6834c038eb7b704744
Author: Ray Molenkamp
Date: Thu Jun 25 18:50:28 2020 -0600
Branches: master
https://developer.blender.org/rB2db4a81fe4af0a003e545b6834c038eb7b704744
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.
===================================================================
M build_files/build_environment/cmake/usd.cmake
===================================================================
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.
More information about the Bf-blender-cvs
mailing list