Commit: 4e3562f45ad6109fe3913c5ec7b2d5ff9c6f97bc
Author: Sergey Sharybin
Date: Fri Dec 14 17:39:38 2018 +0100
Branches: master
https://developer.blender.org/rB4e3562f45ad6109fe3913c5ec7b2d5ff9c6f97bc
Dependencies builder: Don't rely on system-wide PugiXML
===================================================================
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 795892f29e2..b3cf7356926 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
