Skip to content

Commit

Permalink
[build_usd.py] Minor updates to zlib build options
Browse files Browse the repository at this point in the history
Items added to requiredDependencies need to be in dependency order.

(Internal change: 2351155)
  • Loading branch information
davidgyu authored and pixar-oss committed Dec 10, 2024
1 parent a40dca2 commit be52dc6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions build_scripts/build_usd.py
Original file line number Diff line number Diff line change
Expand Up @@ -2096,10 +2096,10 @@ def InstallUSD(context, force, buildArgs):
subgroup = group.add_mutually_exclusive_group()
subgroup.add_argument("--zlib", dest="build_zlib",
action="store_true", default=True,
help="Install zlib on behalf of dependencies")
help="Install zlib on behalf of dependencies (default)")
subgroup.add_argument("--no-zlib", dest="build_zlib",
action="store_false",
help="Do not install zlib for dependencies (default)")
help="Do not install zlib for dependencies")

group = parser.add_argument_group(title="Imaging Plugin Options")
subgroup = group.add_mutually_exclusive_group()
Expand Down Expand Up @@ -2412,18 +2412,18 @@ def ForceBuildDependency(self, dep):

if context.buildImaging:
if context.enablePtex:
requiredDependencies += [PTEX, ZLIB]
requiredDependencies += [ZLIB, PTEX]

requiredDependencies += [OPENSUBDIV]

if context.enableOpenVDB:
requiredDependencies += [BLOSC, BOOST, OPENEXR, OPENVDB, TBB, ZLIB]
requiredDependencies += [ZLIB, TBB, BLOSC, BOOST, OPENEXR, OPENVDB]

if context.buildOIIO:
requiredDependencies += [BOOST, JPEG, TIFF, PNG, OPENEXR, OPENIMAGEIO, ZLIB]
requiredDependencies += [ZLIB, BOOST, JPEG, TIFF, PNG, OPENEXR, OPENIMAGEIO]

if context.buildOCIO:
requiredDependencies += [OPENCOLORIO, ZLIB]
requiredDependencies += [ZLIB, OPENCOLORIO]

if context.buildEmbree:
requiredDependencies += [TBB, EMBREE]
Expand Down

0 comments on commit be52dc6

Please sign in to comment.