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/app/CMakeLists.txt | |
| 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/app/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/app/CMakeLists.txt | 4 |
1 files changed, 4 insertions, 0 deletions
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() |