Fix OSL build error on macOS, no need to use external pugixml

This commit is contained in:
Brecht Van Lommel
2020-01-19 16:58:23 +01:00
parent 66e02d15a0
commit 4f4435001a
2 changed files with 2 additions and 3 deletions

View File

@@ -93,7 +93,7 @@ include(cmake/python_site_packages.cmake)
include(cmake/package_python.cmake)
include(cmake/numpy.cmake)
include(cmake/usd.cmake)
if(UNIX AND NOT APPLE)
if(UNIX)
# Rely on PugiXML compiled with OpenImageIO
else()
include(cmake/pugixml.cmake)

View File

@@ -87,7 +87,6 @@ elseif(APPLE)
set(OSL_EXTRA_ARGS
${OSL_EXTRA_ARGS}
-DHIDE_SYMBOLS=OFF
-DPUGIXML_HOME=${LIBDIR}/pugixml
)
endif()
@@ -114,7 +113,7 @@ add_dependencies(
external_openimageio
)
if(UNIX AND NOT APPLE)
if(UNIX)
# Rely on PugiXML compiled with OpenImageIO
else()
add_dependencies(