Skip to content

Commit 5e64569

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 9511561 commit 5e64569

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
@@ -1545,7 +1545,7 @@ def InstallDraco(context, force, buildArgs):
15451545
############################################################
15461546
# MaterialX
15471547

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

15501550
def InstallMaterialX(context, force, buildArgs):
15511551
with CurrentWorkingDirectory(DownloadURL(MATERIALX_URL, context, force)):
@@ -1561,6 +1561,12 @@ def InstallMaterialX(context, force, buildArgs):
15611561
cmakeOptions = ['-DMATERIALX_BUILD_SHARED_LIBS=ON',
15621562
'-DMATERIALX_BUILD_TESTS=OFF'
15631563
]
1564+
if context.buildTarget in apple_utils.EMBEDDED_PLATFORMS:
1565+
cmakeOptions.extend([
1566+
"-DMATERIALX_BUILD_GEN_MSL=ON",
1567+
"-DMATERIALX_BUILD_GEN_GLSL=OFF",
1568+
"-DMATERIALX_BUILD_IOS=ON"
1569+
])
15641570
cmakeOptions += buildArgs
15651571
RunCMake(context, force, cmakeOptions)
15661572

@@ -2301,7 +2307,7 @@ def __init__(self, args):
23012307
if args.draco_location else None)
23022308

23032309
# - MaterialX Plugin
2304-
self.buildMaterialX = args.build_materialx and not coreOnly
2310+
self.buildMaterialX = args.build_materialx
23052311

23062312
# - Spline Tests
23072313
self.buildMayapyTests = args.build_mayapy_tests

0 commit comments

Comments
 (0)