Merge branch 'usd_update'

darbyjohnston · May 24, 2024 · 70e3b15 · 70e3b15
2 parents c231a95 + 9e9c432
commit 70e3b15
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/cmake/Modules/Package.cmake b/cmake/Modules/Package.cmake
@@ -142,40 +142,40 @@ elseif(APPLE)
             ${CMAKE_INSTALL_PREFIX}/lib/libboost_atomic.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libboost_regex.dylib)
         set(MATERIALX_DYLIBS
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderMsl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderMsl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderMsl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderMsl.dylib
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.1.38.7.dylib
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.1.38.8.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.1.dylib
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.dylib)
         set(TBB_DYLIBS
@@ -305,37 +305,37 @@ else()
         set(MATERIALX_LIBS
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXCore.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXFormat.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenGlsl.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMdl.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenMsl.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenOsl.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXGenShader.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderGlsl.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderHw.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.so.1.38.7
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRenderOsl.so.1.38.8
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.so
             ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.so.1
-            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.so.1.38.7)
+            ${CMAKE_INSTALL_PREFIX}/lib/libMaterialXRender.so.1.38.8)
         set(TBB_LIBS
             ${CMAKE_INSTALL_PREFIX}/lib/libtbb_debug.so
             ${CMAKE_INSTALL_PREFIX}/lib/libtbb_debug.so.2

diff --git a/etc/SuperBuild/cmake/Modules/BuildUSD.cmake b/etc/SuperBuild/cmake/Modules/BuildUSD.cmake
@@ -10,7 +10,7 @@ include(ExternalProject)
 set(USD_DEPS)
 
 set(USD_GIT_REPOSITORY https://github.com/PixarAnimationStudios/OpenUSD.git)
-set(USD_GIT_TAG v24.03)
+set(USD_GIT_TAG v24.05)
 
 string(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_LC)
 set(USD_ARGS --build-variant ${CMAKE_BUILD_TYPE_LC})