diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-26 11:52:24 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-06-26 11:52:24 +0300 |
| commit | bf1b00212ac1129eb72d8dc2cb741eb04fcf6dcf (patch) | |
| tree | 1cc7386c4363b426b68b4e83a6bf8a24defdb15e /build_files | |
| parent | 005f90a4347258445c6cf81e9258af29a51fc46f (diff) | |
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.
Diffstat (limited to 'build_files')
| -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 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 |