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:
authorRay Molenkamp <github@lazydodo.com>2020-11-30 00:01:33 +0300
committerRay Molenkamp <github@lazydodo.com>2020-11-30 00:01:33 +0300
commitdca9aa0053f7d711c1b42a4f2042827a1e286bea (patch)
tree89ff74b5ec88860a51bc94dfa319dfb32ac3e860 /build_files/build_environment/cmake/openimageio.cmake
parent176324aa5cfcf0703dfae296028bc3aef1ff5f14 (diff)
Deps: PugiXML 1.10
This separates out PugiXML that was previously bundled by OIIO. As this linux/mac libs are not available this commit only contains the builder and windows changes, and the option to enable pugixml is guarded by a platform if, this can be removed once all platforms have committed the svn libs. For details see D8628
Diffstat (limited to 'build_files/build_environment/cmake/openimageio.cmake')
-rw-r--r--build_files/build_environment/cmake/openimageio.cmake4
1 files changed, 4 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/openimageio.cmake b/build_files/build_environment/cmake/openimageio.cmake
index 4254d923de1..50fd67eca8e 100644
--- a/build_files/build_environment/cmake/openimageio.cmake
+++ b/build_files/build_environment/cmake/openimageio.cmake
@@ -112,6 +112,9 @@ set(OPENIMAGEIO_EXTRA_ARGS
-DOPENEXR_IEX_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}Iex${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DOPENEXR_ILMIMF_LIBRARY=${LIBDIR}/openexr/lib/${LIBPREFIX}IlmImf${OPENEXR_VERSION_POSTFIX}${LIBEXT}
-DSTOP_ON_WARNING=OFF
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DPUGIXML_LIBRARY=${LIBDIR}/pugixml/lib/${LIBPREFIX}pugixml${LIBEXT}
+ -DPUGIXML_INCLUDE_DIR=${LIBDIR}/pugixml/include/
${WEBP_FLAGS}
${OIIO_SIMD_FLAGS}
)
@@ -134,6 +137,7 @@ add_dependencies(
external_jpeg
external_boost
external_tiff
+ external_pugixml
external_openjpeg${OPENJPEG_POSTFIX}
${WEBP_DEP}
)