Bump USD

f3d-app · Nov 18, 2024 · caca469 · caca469
1 parent 7b76aae
commit caca469
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2,072 deletions.
diff --git a/projects/f3d.cmake b/projects/f3d.cmake
@@ -19,7 +19,7 @@ superbuild_add_project(f3d
   LICENSE_FILES
     LICENSE.md
     doc/THIRD_PARTY_LICENSES.md
-  DEPENDS vtk
+  DEPENDS vtk cxx17
   DEPENDS_OPTIONAL pybind11 alembic assimp draco occt openexr openusd openvdb
   CMAKE_ARGS
     -DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib

diff --git a/projects/openusd.cmake b/projects/openusd.cmake
@@ -2,7 +2,7 @@ superbuild_add_project(openusd
   BUILD_SHARED_LIBS_INDEPENDENT
   LICENSE_FILES
     LICENSE.txt
-  DEPENDS boost tbb
+  DEPENDS tbb
   CMAKE_ARGS
     -DPXR_BUILD_EXAMPLES:BOOL=OFF
     -DPXR_BUILD_IMAGING:BOOL=OFF
@@ -15,9 +15,6 @@ superbuild_add_project(openusd
     -DPXR_INSTALL_LOCATION:STRING=../lib/usd
 )
 
-# Upstream issue: https://github.com/PixarAnimationStudios/OpenUSD/issues/1471
-superbuild_apply_patch(openusd onetbb "Add support for oneTBB")
-
 # For some reason, pdb files and parallel build on Windows are causing issues
 superbuild_apply_patch(openusd msvc-defaults "Remove PDB generation and parallel build")