From e0a809fb1d5ff0c79bd8f915bb8660f33ac5c512 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
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/app/CMakeLists.txt | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'intern/cycles/app')

diff --git a/intern/cycles/app/CMakeLists.txt b/intern/cycles/app/CMakeLists.txt
index 3af72ac4431..0694be0321a 100644
--- a/intern/cycles/app/CMakeLists.txt
+++ b/intern/cycles/app/CMakeLists.txt
@@ -32,6 +32,10 @@ set(LIBRARIES
 	extern_cuew
 )
 
+if(NOT PUGIXML_LIBRARIES STREQUAL "")
+	list(APPEND LIBRARIES ${PUGIXML_LIBRARIES})
+endif()
+
 if(NOT CYCLES_STANDALONE_REPOSITORY)
 	list(APPEND LIBRARIES bf_intern_glew_mx)
 endif()
-- 
cgit v1.2.3