Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@blender.org>2020-12-03 13:07:06 +0300
committerSybren A. Stüvel <sybren@blender.org>2020-12-03 13:07:06 +0300
commit899dcc5f60667a54d9628fcb5656f7e9db642068 (patch)
tree10b51fadf821deb428789d5a37f448d576cca6a5
parentacaee97c2f8fe00142416ce7f96df409fdc67f91 (diff)
Fix linker errors when building without Cycles
Fix linker errors by explicitly linking PugiXML when OpenImageIO is used. PugiXML has been separated from OpenImageIO (D8628). This means that any time OpenImageIO libraries are linked, the PugiXML libraries have to be linked as well. This was set up correctly for Cycles, but not for imbuf. Because of this, building without Cycles but with OIIO would produce linker errors.
-rw-r--r--source/blender/imbuf/intern/oiio/CMakeLists.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/imbuf/intern/oiio/CMakeLists.txt b/source/blender/imbuf/intern/oiio/CMakeLists.txt
index 211b6a0b40e..ee5848dec36 100644
--- a/source/blender/imbuf/intern/oiio/CMakeLists.txt
+++ b/source/blender/imbuf/intern/oiio/CMakeLists.txt
@@ -49,6 +49,7 @@ if(WITH_OPENIMAGEIO)
)
list(APPEND LIB
${OPENIMAGEIO_LIBRARIES}
+ ${PUGIXML_LIBRARIES}
)
if(WITH_IMAGE_OPENEXR)
list(APPEND INC_SYS