Merge branch 'master' into blender2.8

2018-12-14 17:40:27 +01:00
parent d3e0d7f082 4e3562f45a
commit ccc09ec124
1 changed files with 5 additions and 0 deletions
--- 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