From bf1b00212ac1129eb72d8dc2cb741eb04fcf6dcf Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 26 Jun 2019 10:52:24 +0200 Subject: 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. --- build_files/build_environment/cmake/osl.cmake | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'build_files') 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 -- cgit v1.2.3