diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-19 18:58:23 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2020-01-20 11:39:54 +0300 |
commit | 4f4435001ac306cb7a7ef3dca9240633f6700933 (patch) | |
tree | 0b2748f5e92b33de8693fd502d930905c90960de /build_files | |
parent | 66e02d15a0eeca35bbff578c018860f7a6ea7e41 (diff) |
Fix OSL build error on macOS, no need to use external pugixml
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/build_environment/CMakeLists.txt | 2 | ||||
-rw-r--r-- | build_files/build_environment/cmake/osl.cmake | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/build_files/build_environment/CMakeLists.txt b/build_files/build_environment/CMakeLists.txt index fb32d2218b8..d3f98d55049 100644 --- a/build_files/build_environment/CMakeLists.txt +++ b/build_files/build_environment/CMakeLists.txt @@ -93,7 +93,7 @@ include(cmake/python_site_packages.cmake) include(cmake/package_python.cmake) include(cmake/numpy.cmake) include(cmake/usd.cmake) -if(UNIX AND NOT APPLE) +if(UNIX) # Rely on PugiXML compiled with OpenImageIO else() include(cmake/pugixml.cmake) diff --git a/build_files/build_environment/cmake/osl.cmake b/build_files/build_environment/cmake/osl.cmake index 840eb87b196..42f4f14fab0 100644 --- a/build_files/build_environment/cmake/osl.cmake +++ b/build_files/build_environment/cmake/osl.cmake @@ -87,7 +87,6 @@ elseif(APPLE) set(OSL_EXTRA_ARGS ${OSL_EXTRA_ARGS} -DHIDE_SYMBOLS=OFF - -DPUGIXML_HOME=${LIBDIR}/pugixml ) endif() @@ -114,7 +113,7 @@ add_dependencies( external_openimageio ) -if(UNIX AND NOT APPLE) +if(UNIX) # Rely on PugiXML compiled with OpenImageIO else() add_dependencies( |