Skip to content

Commit 9d31418

Browse files
Modernize CMake handling of OIIO dependency (AcademySoftwareFoundation#2495)
By asking CMake to write MATERIALX_BUILD_OIIO in the generated CMake files if MaterialXRender was built with OpenImageIO support.
1 parent f46bf25 commit 9d31418

2 files changed

Lines changed: 1 addition & 4 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,9 +229,6 @@ if(MATERIALX_BUILD_RENDER AND MATERIALX_BUILD_GEN_OSL AND MATERIALX_BUILD_TESTS)
229229
endif()
230230

231231
# Add global definitions
232-
if(MATERIALX_BUILD_OIIO)
233-
add_definitions(-DMATERIALX_BUILD_OIIO)
234-
endif()
235232
if(MATERIALX_TEST_RENDER)
236233
add_definitions(-DMATERIALX_TEST_RENDER)
237234
endif()

source/MaterialXRender/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ if(UNIX)
2626
endif()
2727

2828
if(MATERIALX_BUILD_OIIO)
29-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/External/OpenImageIO")
3029
find_package(OpenImageIO CONFIG REQUIRED)
3130
target_link_libraries(${TARGET_NAME} PRIVATE OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)
31+
target_compile_definitions(MaterialXGraphEditor PUBLIC MATERIALX_BUILD_OIIO)
3232
endif()

0 commit comments

Comments
 (0)