From e0a809fb1d5ff0c79bd8f915bb8660f33ac5c512 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Sat, 15 Nov 2014 22:56:22 +0500 Subject: 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. --- intern/cycles/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) (limited to 'intern/cycles/CMakeLists.txt') 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. -- cgit v1.2.3