Skip to content

Commit 9f41a86

Browse files
committed
pxrConfig.cmake: request MaterialX RenderGlsl component
1 parent c80a87b commit 9f41a86

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

cmake/defaults/Packages.cmake

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,11 @@ if (PXR_BUILD_DRACO_PLUGIN)
294294
endif()
295295

296296
if (PXR_ENABLE_MATERIALX_SUPPORT)
297-
find_package(MaterialX REQUIRED)
297+
# MaterialX versions before 1.39.5 do not support package components.
298+
find_package(MaterialX QUIET COMPONENTS RenderGlsl)
299+
if (NOT MaterialX_FOUND)
300+
find_package(MaterialX REQUIRED)
301+
endif()
298302
add_definitions(-DPXR_MATERIALX_SUPPORT_ENABLED)
299303
endif()
300304

pxr/pxrConfig.cmake.in

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,11 @@ if(@PXR_ENABLE_MATERIALX_SUPPORT@)
8787
set(MaterialX_DIR [[@MaterialX_DIR@]])
8888
endif()
8989
endif()
90-
find_dependency(MaterialX)
90+
# MaterialX versions before 1.39.5 do not support package components.
91+
find_package(MaterialX QUIET COMPONENTS RenderGlsl)
92+
if (NOT MaterialX_FOUND)
93+
find_dependency(MaterialX)
94+
endif()
9195
endif()
9296

9397
# Similar to MaterialX above, we are using Imath's cmake package config, so set

0 commit comments

Comments
 (0)