diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-15 20:56:22 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-12-31 23:31:07 +0300 |
| commit | e0a809fb1d5ff0c79bd8f915bb8660f33ac5c512 (patch) | |
| tree | 3a39f25111fe102d26a1838d7b23c702d752f7ba /intern/cycles/util | |
| parent | a4c3ca86715c972fa641f374d9cc01dea35a7fe1 (diff) | |
Cycles: Fix compilation error when OIIO is compiled with external PugiXML parser
Basic idea is to check whether OIIO is compiled with embedded PugiXML parser
and if so use PugiXML from OIIO, otherwise find a standalone PugiXML library.
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_xml.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_xml.h b/intern/cycles/util/util_xml.h index d1b4ee1f2d3..cfd0afc95f7 100644 --- a/intern/cycles/util/util_xml.h +++ b/intern/cycles/util/util_xml.h @@ -17,9 +17,9 @@ #ifndef __UTIL_XML_H__ #define __UTIL_XML_H__ -/* PugiXML from OpenImageIO is used for XML parsing. */ +/* PugiXML is used for XML parsing. */ -#include <OpenImageIO/pugixml.hpp> +#include <pugixml.hpp> CCL_NAMESPACE_BEGIN |