Port fixes for 25.05 on fix-7.4.2

Author: sebastienblor

plugins/procedural/CMakeLists.txt

@@ -39,7 +39,10 @@ endif()
 # LINK
 target_link_libraries(${PROC_NAME} PRIVATE translator common)
 if (ENABLE_HYDRA_IN_USD_PROCEDURAL)
-    target_link_libraries(${PROC_NAME} PRIVATE render_delegate hdsi ndrObjects usdImaging usdImagingArnoldObjects)
+    target_link_libraries(${PROC_NAME} PRIVATE render_delegate ndrObjects usdImaging usdImagingArnoldObjects)
+    if (${USD_VERSION} VERSION_GREATER_EQUAL "0.25.05")
+        target_link_libraries(${PROC_NAME} PRIVATE hdsi;usdSkelImaging;ts)
+    endif ()
 endif()
 
 if (APPLE OR LINUX)

plugins/procedural/SConscript

@@ -118,7 +118,6 @@ else:  # shared libs
         'work', # render_delegate
         'hf', # render_delegate
         'hd', # render_delegate
-		'hdsi', # render_delegate
         'hdx', # render_delegate
         'sdf', # render_delegate
         'usdImaging', # render_delegate
@@ -133,6 +132,9 @@ else:  # shared libs
     if local_env['USD_VERSION_INT'] >= 2411:
         usd_libs += ['boost','python',]
 
+    if local_env['USD_VERSION_INT'] >= 2505:
+        usd_libs += ['hdsi','ts', 'usdSkelImaging']
+
     usd_deps += [get_tbb_lib(env)]
 
     usd_libs, usd_sources = link_usd_libraries(local_env, usd_libs)