Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-11-15 20:56:22 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2014-12-31 23:31:07 +0300
commite0a809fb1d5ff0c79bd8f915bb8660f33ac5c512 (patch)
tree3a39f25111fe102d26a1838d7b23c702d752f7ba /intern/cycles/CMakeLists.txt
parenta4c3ca86715c972fa641f374d9cc01dea35a7fe1 (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/CMakeLists.txt')
-rw-r--r--intern/cycles/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index 01912019d80..56deb8d0ea0 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -161,6 +161,7 @@ include_directories(
${OPENIMAGEIO_INCLUDE_DIRS}/OpenImageIO
${OPENEXR_INCLUDE_DIR}
${OPENEXR_INCLUDE_DIRS}
+ ${PUGIXML_INCLUDE_DIR}
)
# TODO(sergey): Adjust so standalone repository is also happy.