@@ -169,8 +169,10 @@ endif()
169169
170170if (WIN32 )
171171 set (NVIDIA_PLATFORM_NAME "windows-x86_64" )
172+ set (CARB_PLATFORM_NAME "windows-x86_64" )
172173elseif (UNIX AND NOT APPLE )
173- set (NVIDIA_PLATFORM_NAME "linux-x86_64" )
174+ set (NVIDIA_PLATFORM_NAME "manylinux_2_35_x86_64" )
175+ set (CARB_PLATFORM_NAME "linux-x86_64" )
174176else ()
175177 message (FATAL_ERROR "Only Windows and Linux are supported" )
176178endif ()
@@ -207,27 +209,27 @@ set(KIT_IMGUI_ROOT "${NVIDIA_BUILD_DIR}/target-deps/omni-kit-renderer-imgui")
207209set (PYBIND11_ROOT "${NVIDIA_BUILD_DIR} /target-deps/pybind11" )
208210
209211set (NVIDIA_USD_LIBRARIES
210- ar
211- arch
212- gf
213- js
214- kind
215- ndr
216- pcp
217- plug
218- sdf
219- sdr
220- tf
221- trace
222- usd
223- usdGeom
224- usdLux
225- usdShade
226- usdUI
227- usdUtils
228- usdVol
229- vt
230- work )
212+ usd_ar
213+ usd_arch
214+ usd_gf
215+ usd_js
216+ usd_kind
217+ usd_ndr
218+ usd_pcp
219+ usd_plug
220+ usd_sdf
221+ usd_sdr
222+ usd_tf
223+ usd_trace
224+ usd_usd
225+ usd_usdGeom
226+ usd_usdLux
227+ usd_usdShade
228+ usd_usdUI
229+ usd_usdUtils
230+ usd_usdVol
231+ usd_vt
232+ usd_work )
231233
232234# Add base USD libraries
233235set (NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_LIBRARIES} )
@@ -245,14 +247,14 @@ else()
245247endif ()
246248
247249# Add boost python
248- set (NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} boost_python310 )
250+ set (NVIDIA_USD_TARGET_NAMES ${NVIDIA_USD_TARGET_NAMES} boost_python311 )
249251
250252if (WIN32 )
251- set (NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python310 -vc142-mt-x64-1_76 )
252- set (NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python310 -vc142-mt-gd- x64-1_76 )
253+ set (NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python311 -vc142-mt-x64-1_82 )
254+ set (NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python311 -vc142-mt-x64-1_82 )
253255else ()
254- set (NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python310 )
255- set (NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python310 )
256+ set (NVIDIA_USD_RELEASE_LIBRARIES ${NVIDIA_USD_RELEASE_LIBRARIES} boost_python311 )
257+ set (NVIDIA_USD_DEBUG_LIBRARIES ${NVIDIA_USD_DEBUG_LIBRARIES} boost_python311 )
256258endif ()
257259
258260if (${USE_NVIDIA_RELEASE_LIBRARIES} )
@@ -267,14 +269,20 @@ add_prebuilt_project(
267269 "${NVIDIA_USD_ROOT} /${NVIDIA_DEBUG_FOLDER_NAME} /include"
268270 RELEASE_LIBRARY_DIR
269271 "${NVIDIA_USD_ROOT} /${NVIDIA_RELEASE_FOLDER_NAME} /lib"
272+ RELEASE_DLL_DIR
273+ "${NVIDIA_USD_ROOT} /${NVIDIA_RELEASE_FOLDER_NAME} /bin"
270274 DEBUG_LIBRARY_DIR
271275 "${NVIDIA_USD_ROOT} /${NVIDIA_DEBUG_FOLDER_NAME} /lib"
276+ DEBUG_DLL_DIR
277+ "${NVIDIA_USD_ROOT} /${NVIDIA_DEBUG_FOLDER_NAME} /bin"
272278 RELEASE_LIBRARIES
273279 ${NVIDIA_USD_RELEASE_LIBRARIES}
274280 DEBUG_LIBRARIES
275281 ${NVIDIA_USD_DEBUG_LIBRARIES}
276282 TARGET_NAMES
277283 ${NVIDIA_USD_TARGET_NAMES}
284+ TARGETS_IN_DLL_DIR
285+ tbb
278286)
279287# cmake-format: on
280288
@@ -294,30 +302,30 @@ if(WIN32)
294302 DEBUG_DLL_DIR
295303 "${PYTHON_ROOT} "
296304 RELEASE_LIBRARIES
297- python310
305+ python311
298306 DEBUG_LIBRARIES
299- python310
307+ python311
300308 TARGET_NAMES
301- python310
309+ python311
302310 )
303311 # cmake-format: on
304312else ()
305313 # cmake-format: off
306314 add_prebuilt_project(
307315 RELEASE_INCLUDE_DIR
308- "${PYTHON_ROOT} /include/python3.10 "
316+ "${PYTHON_ROOT} /include/python3.11 "
309317 DEBUG_INCLUDE_DIR
310- "${PYTHON_ROOT} /include/python3.10 "
318+ "${PYTHON_ROOT} /include/python3.11 "
311319 RELEASE_LIBRARY_DIR
312320 "${PYTHON_ROOT} /lib"
313321 DEBUG_LIBRARY_DIR
314322 "${PYTHON_ROOT} /lib"
315323 RELEASE_LIBRARIES
316- python3.10
324+ python3.11
317325 DEBUG_LIBRARIES
318- python3.10
326+ python3.11
319327 TARGET_NAMES
320- python310
328+ python311
321329 )
322330 # cmake-format: on
323331endif ()
@@ -338,9 +346,9 @@ add_prebuilt_project(
338346 DEBUG_INCLUDE_DIR
339347 "${CARB_ROOT} /include"
340348 RELEASE_LIBRARY_DIR
341- "${CARB_ROOT} /_build/${NVIDIA_PLATFORM_NAME } /${NVIDIA_RELEASE_FOLDER_NAME} "
349+ "${CARB_ROOT} /_build/${CARB_PLATFORM_NAME } /${NVIDIA_RELEASE_FOLDER_NAME} "
342350 DEBUG_LIBRARY_DIR
343- "${CARB_ROOT} /_build/${NVIDIA_PLATFORM_NAME } /${NVIDIA_DEBUG_FOLDER_NAME} "
351+ "${CARB_ROOT} /_build/${CARB_PLATFORM_NAME } /${NVIDIA_DEBUG_FOLDER_NAME} "
344352 RELEASE_LIBRARIES
345353 carb
346354 DEBUG_LIBRARIES
@@ -389,16 +397,13 @@ add_prebuilt_project(
389397# cmake-format: on
390398
391399if (WIN32 )
392- set (NVIDIA_ADDITIONAL_LIBRARIES
393- "${KIT_IMGUI_ROOT} /bin/imgui.dll"
394- "${KIT_IMGUI_ROOT} /bin/deps/freetype.dll"
395- )
400+ set (NVIDIA_ADDITIONAL_LIBRARIES "${KIT_IMGUI_ROOT} /bin/imgui.dll" )
396401
397402 set_property (GLOBAL PROPERTY NVIDIA_ADDITIONAL_LIBRARIES_PROPERTY "${NVIDIA_ADDITIONAL_LIBRARIES} " )
398403else ()
399404 set (NVIDIA_ADDITIONAL_SEARCH_PATHS
400- "$<TARGET_FILE_DIR:python310 >"
401- "$<TARGET_FILE_DIR:usd >"
405+ "$<TARGET_FILE_DIR:python311 >"
406+ "$<TARGET_FILE_DIR:usd_usd >"
402407 "$<TARGET_FILE_DIR:carb>"
403408 # This is where freetype is located on Linux
404409 "${KIT_IMGUI_ROOT} /bin/deps" )
0 commit comments