diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-14 19:40:27 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-12-14 19:40:27 +0300 |
| commit | ccc09ec124638f9aca0ba0f33e3b4cb22b023960 (patch) | |
| tree | 7954c86ac50bf8cadf0a308ee82acb7f7be93e1b /build_files/build_environment | |
| parent | d3e0d7f0825fbdf503ef82e3f85b11d0faf841e8 (diff) | |
| parent | 4e3562f45ad6109fe3913c5ec7b2d5ff9c6f97bc (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/build_environment')
| -rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
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 |