From 711b6703559d77ba8ab4fe81b3ddded7ce4c23cb Mon Sep 17 00:00:00 2001 From: Jonathan Stone Date: Tue, 2 Apr 2024 17:25:17 -0700 Subject: [PATCH] Remove legacy copy of OIIO for viewer This changelist removes a legacy copy of the OpenImageIO folder that was generated in builds of the MaterialX Viewer. --- source/MaterialXRender/CMakeLists.txt | 2 -- source/MaterialXView/CMakeLists.txt | 6 ------ 2 files changed, 8 deletions(-) diff --git a/source/MaterialXRender/CMakeLists.txt b/source/MaterialXRender/CMakeLists.txt index f87c2c8bce..3cf6a7d787 100644 --- a/source/MaterialXRender/CMakeLists.txt +++ b/source/MaterialXRender/CMakeLists.txt @@ -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( diff --git a/source/MaterialXView/CMakeLists.txt b/source/MaterialXView/CMakeLists.txt index 1d9a329e46..83faa1cb79 100644 --- a/source/MaterialXView/CMakeLists.txt +++ b/source/MaterialXView/CMakeLists.txt @@ -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}")