diff options
| author | Ray Molenkamp <github@lazydodo.com> | 2020-11-30 00:01:33 +0300 |
|---|---|---|
| committer | Ray Molenkamp <github@lazydodo.com> | 2020-11-30 00:01:33 +0300 |
| commit | dca9aa0053f7d711c1b42a4f2042827a1e286bea (patch) | |
| tree | 89ff74b5ec88860a51bc94dfa319dfb32ac3e860 /CMakeLists.txt | |
| parent | 176324aa5cfcf0703dfae296028bc3aef1ff5f14 (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 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f2af75f2745..90f9e432878 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,6 +178,9 @@ mark_as_advanced(BUILDINFO_OVERRIDE_TIME) option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON) option(WITH_IK_SOLVER "Enable Legacy IK solver (only disable for development)" ON) option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke, ocean sim, and audio effects)" ON) +if(WIN32) + option(WITH_PUGIXML "Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export)" ON) +endif() option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) option(WITH_SYSTEM_BULLET "Use the systems bullet library (currently unsupported due to missing features in upstream!)" ) mark_as_advanced(WITH_SYSTEM_BULLET) @@ -697,6 +700,10 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO OFF) set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW OFF) set_and_warn_dependency(WITH_BOOST WITH_USD OFF) set_and_warn_dependency(WITH_BOOST WITH_ALEMBIC OFF) +if(WIN32) + set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF) + set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF) +endif() if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR WITH_OPENVDB OR WITH_OPENCOLORIO OR WITH_USD OR WITH_ALEMBIC)) |