diff options
| -rw-r--r-- | build_files/build_environment/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 15 |
2 files changed, 14 insertions, 7 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index c21ed826736..e4fe7d90176 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -91,7 +91,11 @@ include(cmake/openvdb.cmake) include(cmake/python.cmake) include(cmake/python_site_packages.cmake) include(cmake/numpy.cmake) -include(cmake/pugixml.cmake) +if(UNIX AND NOT APPLE) + # Rely on PugiXML compiled with OpenImageIO +else() + include(cmake/pugixml.cmake) +endif() if(WITH_WEBP) include(cmake/webp.cmake) diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index 7b5909e3700..b8268f90c33 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -81,11 +81,6 @@ if(WIN32) ${OSL_EXTRA_ARGS} -DPUGIXML_HOME=${LIBDIR}/pugixml ) -elseif(UNIX AND NOT APPLE) - set(OSL_EXTRA_ARGS - ${OSL_EXTRA_ARGS} - -DPUGIXML_HOME=${LIBDIR}/pugixml - ) elseif(APPLE) # Make symbol hiding consistent with OIIO which defaults to OFF, # avoids linker warnings on macOS @@ -116,9 +111,17 @@ add_dependencies( external_zlib external_flexbison external_openimageio - external_pugixml ) +if(UNIX AND NOT APPLE) + # Rely on PugiXML compiled with OpenImageIO +else() + add_dependencies( + external_osl + external_pugixml + ) +endif() + if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_osl after_install |