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 /build_files | |
| 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 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_unix.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/build_files/cmake/platform/platform_unix.cmake b/build_files/cmake/platform/platform_unix.cmake index 97bd4981c22..c4d1383c767 100644 --- a/build_files/cmake/platform/platform_unix.cmake +++ b/build_files/cmake/platform/platform_unix.cmake @@ -350,15 +350,12 @@ if(WITH_BOOST) endif() endif() +if(WITH_PUGIXML) + find_package_wrapper(PugiXML) +endif() + if(WITH_OPENIMAGEIO) find_package_wrapper(OpenImageIO) - if(NOT OPENIMAGEIO_PUGIXML_FOUND AND WITH_CYCLES_STANDALONE) - find_package_wrapper(PugiXML) - else() - set(PUGIXML_INCLUDE_DIR "${OPENIMAGEIO_INCLUDE_DIR/OpenImageIO}") - set(PUGIXML_LIBRARIES "") - endif() - set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} |