Skip to content

Commit 62b7cec

Browse files
committed
Update MaterialX to 1.38.8 for iOS support
This requires #2949 to be merged first as that introduces core iOS support first
1 parent fe3fdda commit 62b7cec

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

build_scripts/build_usd.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1556,7 +1556,7 @@ def InstallDraco(context, force, buildArgs):
15561556
############################################################
15571557
# MaterialX
15581558

1559-
MATERIALX_URL = "https://github.com/materialx/MaterialX/archive/v1.38.7.zip"
1559+
MATERIALX_URL = "https://github.com/materialx/MaterialX/archive/v1.38.8.zip"
15601560

15611561
def InstallMaterialX(context, force, buildArgs):
15621562
with CurrentWorkingDirectory(DownloadURL(MATERIALX_URL, context, force)):
@@ -1572,6 +1572,12 @@ def InstallMaterialX(context, force, buildArgs):
15721572
cmakeOptions = ['-DMATERIALX_BUILD_SHARED_LIBS=ON',
15731573
'-DMATERIALX_BUILD_TESTS=OFF'
15741574
]
1575+
if context.buildTarget in apple_utils.EMBEDDED_PLATFORMS:
1576+
cmakeOptions.extend([
1577+
"-DMATERIALX_BUILD_GEN_MSL=ON",
1578+
"-DMATERIALX_BUILD_GEN_GLSL=OFF",
1579+
"-DMATERIALX_BUILD_IOS=ON"
1580+
])
15751581
cmakeOptions += buildArgs
15761582
RunCMake(context, force, cmakeOptions)
15771583

@@ -2312,7 +2318,7 @@ def __init__(self, args):
23122318
if args.draco_location else None)
23132319

23142320
# - MaterialX Plugin
2315-
self.buildMaterialX = args.build_materialx and not coreOnly
2321+
self.buildMaterialX = args.build_materialx
23162322

23172323
# - Spline Tests
23182324
self.buildMayapyTests = args.build_mayapy_tests

0 commit comments

Comments
 (0)