[Bf-blender-cvs] [e0cb67f] master: CMake: Add check for whether OIIO has bundled pugixml library

[Sergey Sharybin]

Commit: e0cb67f7408d0fb60898a732d84889d9f158ed0e
Author: Sergey Sharybin
Date:   Mon Dec 29 15:02:16 2014 +0500
Branches: master
https://developer.blender.org/rBe0cb67f7408d0fb60898a732d84889d9f158ed0e

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.

===================================================================

M	build_files/cmake/Modules/FindOpenImageIO.cmake

===================================================================

diff --git a/build_files/cmake/Modules/FindOpenImageIO.cmake b/build_files/cmake/Modules/FindOpenImageIO.cmake
index 3904998..f8d6612 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