From ae35861a64caf38e5b67dd386ecb1aed08dcca0b Mon Sep 17 00:00:00 2001 From: Ray Molenkamp Date: Wed, 21 Jun 2023 15:04:07 -0600 Subject: [PATCH] deps_builder: Fix USD debug build on windows Backport, was already fixed in 4.0, should have been fixed in 3.6 instead. --- build_files/build_environment/cmake/usd.cmake | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake index 0981c6309dd..955ea62588c 100644 --- a/build_files/build_environment/cmake/usd.cmake +++ b/build_files/build_environment/cmake/usd.cmake @@ -90,11 +90,18 @@ set(USD_EXTRA_ARGS -DTBB_LIBRARIES=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT} -DTbb_TBB_LIBRARY=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT} -DTBB_tbb_LIBRARY_RELEASE=${LIBDIR}/tbb/lib/${LIBPREFIX}${TBB_LIBRARY}${SHAREDLIBEXT} - # 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}${SHAREDLIBEXT} ) +# Ray: I'm not sure if the other platforms relied on this or not but this is no longer +# needed for windows. If mac/lin confirm, this can be removed. +if(NOT WIN32) + list(APPEND USD_EXTRA_ARGS + # 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}${SHAREDLIBEXT} + ) +endif() + ExternalProject_Add(external_usd URL file://${PACKAGE_DIR}/${USD_FILE} DOWNLOAD_DIR ${DOWNLOAD_DIR}