@@ -145,7 +145,9 @@ if("$ENV{AR_DCC_NAME}" STREQUAL "HOUDINI")
145145 if (EXISTS "${AR_PXR_INCLUDE_DIR} /pxr/external/boost" )
146146 set (AR_BOOST_PXR_EXTERNAL_EXISTS 1)
147147 set (AR_BOOST_NAMESPACE pxr_boost)
148- set (AR_BOOST_FOLDER_NAMESPACE boost)
148+ # We still link the absolute path (as to INCLUDE_DIR-ing the pxr/external,
149+ # since some distributions still include boost and then we'd have a first-come-first-serve issue).
150+ set (AR_BOOST_FOLDER_NAMESPACE pxr/external/boost)
149151 if (WIN32 )
150152 set (AR_BOOST_PYTHON_LIB lib${AR_BOOST_NAMESPACE} ${AR_PXR_LIB_PREFIX} python)
151153 else ()
@@ -216,14 +218,17 @@ elseif("$ENV{AR_DCC_NAME}" STREQUAL "MAYA")
216218 if (EXISTS "${AR_PXR_INCLUDE_DIR} /pxr/external/boost" )
217219 set (AR_BOOST_PXR_EXTERNAL_EXISTS 1)
218220 set (AR_BOOST_NAMESPACE pxr_boost)
219- set (AR_BOOST_FOLDER_NAMESPACE boost)
221+ # We still link the absolute path (as to INCLUDE_DIR-ing the pxr/external,
222+ # since some distributions still include boost and then we'd have a first-come-first-serve issue).
223+ set (AR_BOOST_FOLDER_NAMESPACE pxr/external/boost)
220224 set (AR_BOOST_PYTHON_LIB ${AR_PXR_LIB_PREFIX} boost ${AR_PXR_LIB_PREFIX} python)
221225 set (AR_BOOST_LIB_DIR ${AR_PXR_LIB_DIR} )
222- set (AR_BOOST_INCLUDE_DIR ${AR_PXR_INCLUDE_DIR} /pxr/external )
226+ set (AR_BOOST_INCLUDE_DIR ${AR_PXR_INCLUDE_DIR} )
223227 else ()
224228 set (AR_BOOST_PXR_EXTERNAL_EXISTS 0)
225229 set (AR_BOOST_NAMESPACE boost)
226230 set (AR_BOOST_FOLDER_NAMESPACE boost)
231+ set (AR_BOOST_LIB_DIR ${AR_PXR_LIB_DIR} )
227232 if (WIN32 )
228233 if (EXISTS "${AR_MAYA_USD_SDK_LIB_DIR} /boost_python311-vc143-mt-x64-1_81.dll" )
229234 set (AR_BOOST_PYTHON_LIB ${AR_BOOST_NAMESPACE} _${AR_PYTHON_LIB_NUMBER} -vc143-mt-x64-1_81)
0 commit comments