diff options
Diffstat (limited to 'build_files/build_environment/cmake/osl.cmake')
-rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index 7b5909e3700..b8268f90c33 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -81,11 +81,6 @@ 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 @@ -116,9 +111,17 @@ add_dependencies( external_zlib external_flexbison external_openimageio - external_pugixml ) +if(UNIX AND NOT APPLE) + # Rely on PugiXML compiled with OpenImageIO +else() + add_dependencies( + external_osl + external_pugixml + ) +endif() + if(WIN32) if(BUILD_MODE STREQUAL Release) ExternalProject_Add_Step(external_osl after_install |