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 /build_files/build_environment/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 'build_files/build_environment/CMakeLists.txt')
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index 0bc85f20c16..dfbb0e824a0 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -94,11 +94,7 @@ include(cmake/usd.cmake) include(cmake/potrace.cmake) # Boost needs to be included after python.cmake due to the PYTHON_BINARY variable being needed. include(cmake/boost.cmake) -if(UNIX) - # Rely on PugiXML compiled with OpenImageIO -else() - include(cmake/pugixml.cmake) -endif() +include(cmake/pugixml.cmake) if((NOT APPLE) OR ("${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")) include(cmake/ispc.cmake) include(cmake/openimagedenoise.cmake) |