Skip to content

Commit be52dc6

Browse files
davidgyupixar-oss
authored andcommitted
[build_usd.py] Minor updates to zlib build options
Items added to requiredDependencies need to be in dependency order. (Internal change: 2351155)
1 parent a40dca2 commit be52dc6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

build_scripts/build_usd.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -2096,10 +2096,10 @@ def InstallUSD(context, force, buildArgs):
20962096
subgroup = group.add_mutually_exclusive_group()
20972097
subgroup.add_argument("--zlib", dest="build_zlib",
20982098
action="store_true", default=True,
2099-
help="Install zlib on behalf of dependencies")
2099+
help="Install zlib on behalf of dependencies (default)")
21002100
subgroup.add_argument("--no-zlib", dest="build_zlib",
21012101
action="store_false",
2102-
help="Do not install zlib for dependencies (default)")
2102+
help="Do not install zlib for dependencies")
21032103

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

24132413
if context.buildImaging:
24142414
if context.enablePtex:
2415-
requiredDependencies += [PTEX, ZLIB]
2415+
requiredDependencies += [ZLIB, PTEX]
24162416

24172417
requiredDependencies += [OPENSUBDIV]
24182418

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

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

24252425
if context.buildOCIO:
2426-
requiredDependencies += [OPENCOLORIO, ZLIB]
2426+
requiredDependencies += [ZLIB, OPENCOLORIO]
24272427

24282428
if context.buildEmbree:
24292429
requiredDependencies += [TBB, EMBREE]

0 commit comments

Comments
 (0)