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 /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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 126755303dd..2e7745d393a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -963,6 +963,12 @@ if(UNIX AND NOT APPLE) if(WITH_OPENIMAGEIO) find_package_wrapper(OpenImageIO) + if(NOT OPENIMAGEIO_PUGIXML_FOUND AND WITH_CYCLES_STANDALONE) + find_package_wrapper(PugiXML) + else() + set(PUGIXML_INCLUDE_DIR "${OPENIMAGEIO_INCLUDE_DIR/OpenImageIO}") + set(PUGIXML_LIBRARIES "") + endif() set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES}) set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere |