Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump USD #208

Merged
merged 2 commits into from
Nov 19, 2024
Merged

Bump USD #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caca469
Bump USD
Nov 18, 2024
fb607ec
pch
Nov 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion projects/f3d.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ superbuild_add_project(f3d
LICENSE_FILES
LICENSE.md
doc/THIRD_PARTY_LICENSES.md
DEPENDS vtk
DEPENDS vtk cxx17
Meakk marked this conversation as resolved.
Show resolved Hide resolved
DEPENDS_OPTIONAL pybind11 alembic assimp draco occt openexr openusd openvdb
CMAKE_ARGS
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
Expand Down
6 changes: 2 additions & 4 deletions projects/openusd.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -11,13 +11,11 @@ superbuild_add_project(openusd
-DPXR_BUILD_TUTORIALS:BOOL=OFF
-DPXR_BUILD_USD_TOOLS:BOOL=OFF
-DPXR_ENABLE_GL_SUPPORT:BOOL=OFF
-DPXR_ENABLE_PRECOMPILED_HEADERS:BOOL=OFF
-DPXR_ENABLE_PYTHON_SUPPORT:BOOL=OFF
-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")

Expand Down
Loading