diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2020-12-01 18:24:19 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2020-12-01 18:25:51 +0300 |
| commit | 33b7d53df08aa7f3410aa0324e9e2a612514eade (patch) | |
| tree | 324b5e007c4121acff7df483452e172bc68c3438 /CMakeLists.txt | |
| parent | 29401d38d113342d6fe5b5545742ad355f777439 (diff) | |
Deps: Add PugiXML as an official dependency
PugiXML was historically shipped hidden embedded into OIIO, the Grease
Pencil team had a requirement for an XML library recently so pugi seems
like a natural choice since it's not really a 'new' library, we just
turn an implicit dependency into an explicit one.
This commit expands the Windows-specific code in rBdca9aa0053f7 to
include Linux. macOS support will be handled in a later commit.
NOTE: run `cmake -U'*PUGIXML*' .` in the build directory to ensure CMake
finds PugiXML in the new location.
For details see D8628
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 580aa1e8d79..7bc1406dc59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -178,7 +178,7 @@ 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) +if(NOT APPLE) option(WITH_PUGIXML "Enable PugiXML support (Used for OpenImageIO, Grease Pencil SVG export)" ON) endif() option(WITH_BULLET "Enable Bullet (Physics Engine)" ON) @@ -701,7 +701,7 @@ 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) +if(NOT APPLE) set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF) set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF) endif() |