Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brecht@blender.org>2022-08-23 20:01:11 +0300
committerBrecht Van Lommel <brecht@blender.org>2022-08-24 21:21:59 +0300
commitd729906393bfa3da155be9182db49f55f6bd1c4e (patch)
tree9f1a985914668c01f34fa6eb2175b44041523ada /build_files/build_environment/cmake/usd.cmake
parentfbfcc5a544a1dc4c593235d85ae3b98728c7427c (diff)
Enable OpenGL, Metal and OpenImageIO in USD library
Not tested on Windows.
Diffstat (limited to 'build_files/build_environment/cmake/usd.cmake')
-rw-r--r--build_files/build_environment/cmake/usd.cmake19
1 files changed, 8 insertions, 11 deletions
diff --git a/build_files/build_environment/cmake/usd.cmake b/build_files/build_environment/cmake/usd.cmake
index 106aee09379..a8eb6be1231 100644
--- a/build_files/build_environment/cmake/usd.cmake
+++ b/build_files/build_environment/cmake/usd.cmake
@@ -47,6 +47,7 @@ set(USD_EXTRA_ARGS
-DPXR_BUILD_TESTS=OFF
-DPXR_BUILD_EXAMPLES=OFF
-DPXR_BUILD_TUTORIALS=OFF
+ -DPXR_BUILD_USDVIEW=OFF
-DPXR_ENABLE_HDF5_SUPPORT=OFF
-DPXR_ENABLE_MATERIALX_SUPPORT=OFF
-DPXR_ENABLE_OPENVDB_SUPPORT=ON
@@ -57,17 +58,13 @@ set(USD_EXTRA_ARGS
# cube, etc.) to geometry, it's not necessary. Disabling it will make it
# simpler to build Blender; currently only Cycles uses OSL.
-DPXR_ENABLE_OSL_SUPPORT=OFF
- # GL support on Linux also links to X11 libraries. Enabling it would break
- # headless or Wayland-only builds. OpenGL support would be useful if someone
- # wants to work on a Hydra viewport in Blender; when that's actually being
- # worked on, we could patch in a new PXR_ENABLE_X11_SUPPORT option (to
- # separate OpenGL from X11) and contribute it upstream.
- -DPXR_ENABLE_GL_SUPPORT=OFF
- # Disable Metal since USD fails to build this when OpenGL is disabled.
- -DPXR_ENABLE_METAL_SUPPORT=OFF
- # OIIO is used for loading image textures in Hydra Storm / Embree renderers,
- # which we don't use.
- -DPXR_BUILD_OPENIMAGEIO_PLUGIN=OFF
+ # Keep OpenGL and Metal enabled for Hydra support. Note that this indirectly also
+ # adds an X11 dependency on Linux, which would be good to eliminate for headless
+ # and Wayland only builds.
+ #-DPXR_ENABLE_GL_SUPPORT=OFF
+ #-DPXR_ENABLE_METAL_SUPPORT=OFF
+ # OIIO is used for loading image textures in Hydra Storm / Embree renderers.
+ -DPXR_BUILD_OPENIMAGEIO_PLUGIN=ON
# USD 22.03 does not support OCIO 2.x
# Tracking ticket https://github.com/PixarAnimationStudios/USD/issues/1386
-DPXR_BUILD_OPENCOLORIO_PLUGIN=OFF