diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 13:02:16 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-29 13:08:16 +0300 |
| commit | e0cb67f7408d0fb60898a732d84889d9f158ed0e (patch) | |
| tree | ce67ff8c1191527f3e41264155b274a8058514e9 /build_files | |
| parent | 936604e80104c8f93f5220294c6475a026578ba2 (diff) | |
CMake: Add check for whether OIIO has bundled pugixml library
Will become handy when we'll be re-integrating changes from Cycles standalone
repository back to blender.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenImageIO.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake index 39049981385..f8d66124ae6 100644 --- a/build_files/cmake/Modules/FindOpenImageIO.cmake +++ b/build_files/cmake/Modules/FindOpenImageIO.cmake @@ -7,6 +7,7 @@ # OPENIMAGEIO_ROOT_DIR, The base directory to search for OpenImageIO. # 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. # # also defined, but not for general use are # OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library. @@ -63,7 +64,12 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenImageIO DEFAULT_MSG IF(OPENIMAGEIO_FOUND) SET(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARY}) SET(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO_INCLUDE_DIR}) -ENDIF(OPENIMAGEIO_FOUND) + IF(EXISTS ${OPENIMAGEIO_INCLUDE_DIR}/OpenImageIO/pugixml.hpp) + SET(OPENIMAGEIO_PUGIXML_FOUND TRUE) + ENDIF() +ELSE() + SET(OPENIMAGEIO_PUGIXML_FOUND FALSE) +ENDIF() MARK_AS_ADVANCED( OPENIMAGEIO_INCLUDE_DIR |