[Bf-blender-cvs] [4f4435001ac] blender-v2.82-release: Fix OSL build error on macOS, no need to use external pugixml

[Brecht Van Lommel]

Commit: 4f4435001ac306cb7a7ef3dca9240633f6700933
Author: Brecht Van Lommel
Date:   Sun Jan 19 16:58:23 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rB4f4435001ac306cb7a7ef3dca9240633f6700933

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

===================================================================

M	build_files/build_environment/CMakeLists.txt
M	build_files/build_environment/cmake/osl.cmake

===================================================================

diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt
index fb32d2218b8..d3f98d55049 100644
--- a/build_files/build_environment/CMakeLists.txt
+++ b/build_files/build_environment/CMakeLists.txt
@@ -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)
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index 840eb87b196..42f4f14fab0 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -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(