[Bf-blender-cvs] [bf1b00212ac] master: Revert "Build script: Don't use external Pugi for OSL"

[Sergey Sharybin]

Commit: bf1b00212ac1129eb72d8dc2cb741eb04fcf6dcf
Author: Sergey Sharybin
Date:   Wed Jun 26 10:52:24 2019 +0200
Branches: master
https://developer.blender.org/rBbf1b00212ac1129eb72d8dc2cb741eb04fcf6dcf

Revert "Build script: Don't use external Pugi for OSL"

The change did break compilation on default Ubuntu install for Stefan
and on default CentOS install for myself.

This reverts commit 64671e53d20c2a30c64b98c747b0e002218c3952.

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

M	build_files/build_environment/cmake/osl.cmake

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

diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake
index 7479a0f1efb..7b5909e3700 100644
--- a/build_files/build_environment/cmake/osl.cmake
+++ b/build_files/build_environment/cmake/osl.cmake
@@ -81,6 +81,11 @@ 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