Skip to content

Commit 24cf7fc

Browse files
Fix MaterialXRender private dependency to OIIO (AcademySoftwareFoundation#2497)
Also declare downstream dependencies when building static libraries.
1 parent 531ded4 commit 24cf7fc

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

cmake/modules/MaterialXConfig.cmake.in

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
# Auto-generated content:
99
@PACKAGE_INIT@
1010

11+
include(CMakeFindDependencyMacro)
12+
1113
# Gather MaterialX targets:
1214
include("${CMAKE_CURRENT_LIST_DIR}/@CMAKE_PROJECT_NAME@Targets.cmake")
1315

@@ -22,6 +24,17 @@ set_and_check(MATERIALX_STDLIB_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/libraries")
2224
if(@MATERIALX_BUILD_PYTHON@ AND @MATERIALX_INSTALL_PYTHON@)
2325
set_and_check(MATERIALX_PYTHON_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/python")
2426
endif()
27+
28+
# Dependencies when building static libraries:
29+
if(NOT @MATERIALX_BUILD_SHARED_LIBS@)
30+
if(@MATERIALX_BUILD_OIIO@ AND @MATERIALX_BUILD_RENDER@)
31+
find_dependency(OpenImageIO CONFIG)
32+
endif()
33+
if(@MATERIALX_BUILD_OCIO@)
34+
find_dependency(OpenColorIO CONFIG)
35+
endif()
36+
endif()
37+
2538
if(@MATERIALX_BUILD_RENDER@ AND @MATERIALX_INSTALL_RESOURCES@)
2639
set_and_check(MATERIALX_RESOURCES_DIR "@PACKAGE_CMAKE_INSTALL_PREFIX@/resources")
2740
endif()

source/MaterialXRender/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@ endif()
2828
if(MATERIALX_BUILD_OIIO)
2929
find_package(OpenImageIO CONFIG REQUIRED)
3030
target_link_libraries(${TARGET_NAME} PRIVATE OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)
31-
target_compile_definitions(MaterialXGraphEditor PUBLIC MATERIALX_BUILD_OIIO)
31+
target_compile_definitions(MaterialXRender PUBLIC MATERIALX_BUILD_OIIO)
3232
endif()

0 commit comments

Comments
 (0)