From be52dc6e33b3053d216d73a2f822b8f234c1fa67 Mon Sep 17 00:00:00 2001 From: davidgyu Date: Tue, 10 Dec 2024 09:44:00 -0800 Subject: [PATCH] [build_usd.py] Minor updates to zlib build options Items added to requiredDependencies need to be in dependency order. (Internal change: 2351155) --- build_scripts/build_usd.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build_scripts/build_usd.py b/build_scripts/build_usd.py index 93ecfbd381..f86eda5853 100644 --- a/build_scripts/build_usd.py +++ b/build_scripts/build_usd.py @@ -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() @@ -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]