Skip to content

Commit

Permalink
Remove legacy copy of OIIO for viewer
Browse files Browse the repository at this point in the history
This changelist removes a legacy copy of the OpenImageIO folder that was generated in builds of the MaterialX Viewer.
  • Loading branch information
jstone-lucasfilm committed Apr 4, 2024
1 parent d427f9f commit 711b670
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
2 changes: 0 additions & 2 deletions source/MaterialXRender/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,6 @@ if(MATERIALX_BUILD_OIIO)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/External/OpenImageIO")
find_package(OpenImageIO CONFIG REQUIRED)
target_link_libraries(${MATERIALX_MODULE_NAME} OpenImageIO::OpenImageIO OpenImageIO::OpenImageIO_Util)
# Also needed by MaterialXView:
set(OPENIMAGEIO_ROOT_DIR "${OpenImageIO_INCLUDE_DIR}/../" PARENT_SCOPE)
endif()

set_target_properties(
Expand Down
6 changes: 0 additions & 6 deletions source/MaterialXView/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,6 @@ target_include_directories(
${NANOGUI_INCLUDE_DIRS}
${NANOGUI_EXTRA_INCS})

if(MATERIALX_BUILD_OIIO AND OPENIMAGEIO_ROOT_DIR)
add_custom_command(TARGET MaterialXView POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_directory
${OPENIMAGEIO_ROOT_DIR}/bin ${CMAKE_BINARY_DIR}/bin)
endif()

set_target_properties(
MaterialXView PROPERTIES
INSTALL_RPATH "${MATERIALX_UP_ONE_RPATH}")
Expand Down

0 comments on commit 711b670

Please sign in to comment.