Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Dec 2018 16:40:27 +0000 (17:40 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 14 Dec 2018 16:40:27 +0000 (17:40 +0100)
build_files/build_environment/cmake/osl.cmake

index 795892f29e2d4dd5a6b91c2098bcd448ed1754e6..b3cf735692600a759443c9ae0d846158194cfc0c 100644 (file)
@@ -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