Skip to content

Commit

Permalink
Update FindOpenImageIO.cmake to support newer OIIO versions
Browse files Browse the repository at this point in the history
Newer OIIO version has split the library in two.
The regular library and an utils library.

The regular library depends on the  utils library, so we need to include
it as well if it is found.
  • Loading branch information
DarkDefender committed Aug 10, 2022
1 parent 72845de commit d0c9d69
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion common/cmake/FindOpenImageIO.cmake
Expand Up @@ -53,6 +53,7 @@ SET(OPENIMAGEIO_HINTS
)
SET(OPENIMAGEIO_PATHS PATHS /usr/lib /usr/lib64 /lib /lib64)
FIND_LIBRARY(OPENIMAGEIO_LIBRARY OpenImageIO ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})
FIND_LIBRARY(OPENIMAGEIO_UTIL_LIBRARY OpenImageIO_Util ${OPENIMAGEIO_HINTS} ${OPENIMAGEIO_PATHS})

SET(OPENIMAGEIO_ROOT_LAST ${OPENIMAGEIO_ROOT} CACHE INTERNAL "Last value of OPENIMAGEIO_ROOT to detect changes")

Expand All @@ -68,8 +69,9 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO

IF (OPENIMAGEIO_FOUND)
SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR})
SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY})
SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY} ${OPENIMAGEIO_UTIL_LIBRARY})
ENDIF()

MARK_AS_ADVANCED(OPENIMAGEIO_INCLUDE_DIR)
MARK_AS_ADVANCED(OPENIMAGEIO_LIBRARY)
MARK_AS_ADVANCED(OPENIMAGEIO_UTIL_LIBRARY)

0 comments on commit d0c9d69

Please sign in to comment.