diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | build_files/cmake/Modules/FindOpenImageIO.cmake | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f0fa76969c..843f43024b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1445,6 +1445,7 @@ elseif(WIN32) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib) set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0") set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD") + set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe") add_definitions(-DOIIO_STATIC_BUILD) endif() @@ -1684,6 +1685,7 @@ elseif(WIN32) set(OPENIMAGEIO_LIBRARIES OpenImageIO) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib) set(OPENIMAGEIO_DEFINITIONS "") + set(OPENIMAGEIO_IDIFF "${OPENIMAGEIO}/bin/idiff.exe") endif() if(WITH_LLVM) @@ -2012,6 +2014,7 @@ elseif(APPLE) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO}/lib/libOpenImageIO.a ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES}) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} ${PNG_LIBPATH} ${TIFF_LIBPATH} ${OPENEXR_LIBPATH} ${ZLIB_LIBPATH}) set(OPENIMAGEIO_DEFINITIONS "-DOIIO_STATIC_BUILD") + set(OPENIMAGEIO_IDIFF "${LIBDIR}/openimageio/bin/idiff") endif() if(WITH_OPENCOLORIO) diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index f8d66124ae6..6b82c9daff3 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -8,6 +8,7 @@ # This can also be an environment variable. # OPENIMAGEIO_FOUND, If false, do not try to use OpenImageIO. # OPENIMAGEIO_PUGIXML_FOUND, Indicates whether OIIO has biltin PuguXML parser. +# OPENIMAGEIO_IDIFF, full path to idiff application if found. # # also defined, but not for general use are # OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library. @@ -55,6 +56,14 @@ FIND_LIBRARY(OPENIMAGEIO_LIBRARY lib64 lib ) +FIND_FILE(OPENIMAGEIO_IDIFF + NAMES + idiff + ${OPENIMAGEIO_ROOT_DIR} + PATH_SUFFIXES + bin +) + # handle the QUIETLY and REQUIRED arguments and set OPENIMAGEIO_FOUND to TRUE if # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) |