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/cmake | |
| 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/cmake')
| -rw-r--r-- | intern/cycles/cmake/external_libs.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 7f9a9e07487..537de2e7bc9 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -66,6 +66,12 @@ if(CYCLES_STANDALONE_REPOSITORY) #### # OpenImageIO find_package(OpenImageIO REQUIRED) + if(OPENIMAGEIO_PUGIXML_FOUND) + set(PUGIXML_INCLUDE_DIR "${OPENIMAGEIO_INCLUDE_DIR/OpenImageIO}") + set(PUGIXML_LIBRARIES "") + else() + find_package(PugiXML REQUIRED) + endif() # OIIO usually depends on OpenEXR, so find this library # but don't make it required. @@ -75,10 +81,12 @@ if(CYCLES_STANDALONE_REPOSITORY) # Boost set(__boost_packages filesystem regex system thread date_time) if(WITH_CYCLES_NETWORK) - list(APPEND __boost_packages serialization) + list(APPEND __boost_packages serialization) endif() if(WITH_CYCLES_OSL AND APPLE) - list(APPEND __boost_packages wave) + # TODO(sergey): This is because of the way how our precompiled + # libraries works, could be different for someone's else libs.. + list(APPEND __boost_packages wave) endif() find_package(Boost 1.48 COMPONENTS ${__boost_packages} REQUIRED) if(NOT Boost_FOUND) |