Skip to content

Commit d7e30cc

Browse files
Remove legacy MATERIALX_OIIO_DIR (#2342)
This changelist removes the legacy `MATERIALX_OIIO_DIR` option, which connected to a CMake pathway that is no longer present in OpenImageIO 2.2+.
1 parent 04f3db8 commit d7e30cc

3 files changed

Lines changed: 0 additions & 5 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ set(MATERIALX_PYTHON_EXECUTABLE "" CACHE FILEPATH
119119
set(MATERIALX_PYTHON_PYBIND11_DIR "" CACHE PATH
120120
"Path to a folder containing the PyBind11 source to be used in building MaterialX Python.")
121121

122-
set(MATERIALX_OIIO_DIR "" CACHE PATH "Path to the root folder of the OpenImageIO installation.")
123-
124122
# Settings to define installation layout
125123
set(MATERIALX_INSTALL_INCLUDE_PATH "include" CACHE STRING "Install header include path (e.g. 'inc', 'include').")
126124
set(MATERIALX_INSTALL_LIB_PATH "lib" CACHE STRING "Install lib path (e.g. 'libs', 'lib').")
@@ -186,7 +184,6 @@ mark_as_advanced(MATERIALX_DYNAMIC_ANALYSIS)
186184
mark_as_advanced(MATERIALX_PYTHON_VERSION)
187185
mark_as_advanced(MATERIALX_PYTHON_EXECUTABLE)
188186
mark_as_advanced(MATERIALX_PYTHON_PYBIND11_DIR)
189-
mark_as_advanced(MATERIALX_OIIO_DIR)
190187
mark_as_advanced(MATERIALX_OSL_BINARY_OSLC)
191188
mark_as_advanced(MATERIALX_OSL_BINARY_TESTRENDER)
192189
mark_as_advanced(MATERIALX_OSL_INCLUDE_PATH)

documents/DeveloperGuide/MainPage.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ The MaterialX C++ libraries are automatically included when building MaterialX t
2929
To enable OpenImageIO and OpenColorIO support in MaterialX builds, the following additional options may be used:
3030

3131
- `MATERIALX_BUILD_OIIO`: Requests that MaterialXRender be built with OpenImageIO in addition to stb_image, extending the set of supported image formats. The minimum supported version of OpenImageIO is 2.2.
32-
- `MATERIALX_OIIO_DIR`: Path to the root folder of an OpenImageIO installation. If MATERIALX_BUILD_OIIO has been enabled, then this option may be used to select which installation is used.
3332
- `MATERIALX_BUILD_OCIO`: Requests that MaterialXGenShader be built with support for custom OpenColorIO color spaces and transforms. The minimum supported version of OpenColorIO is 2.4.
3433

3534
See the [MaterialX Unit Tests](https://github.com/AcademySoftwareFoundation/MaterialX/tree/main/source/MaterialXTest) page for documentation on shader generation and render testing in GLSL, OSL, and MDL.

source/MaterialXRender/CMakeLists.txt

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

2828
if(MATERIALX_BUILD_OIIO)
29-
set(OPENIMAGEIO_ROOT_DIR ${MATERIALX_OIIO_DIR})
3029
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/External/OpenImageIO")
3130
find_package(OpenImageIO CONFIG REQUIRED)
3231
target_link_libraries(${TARGET_NAME} PRIVATE OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)

0 commit comments

Comments
 (0)