diff --git a/build_files/build_environment/cmake/opencolorio.cmake b/build_files/build_environment/cmake/opencolorio.cmake index 85d6ce2483d..06314bce301 100644 --- a/build_files/build_environment/cmake/opencolorio.cmake +++ b/build_files/build_environment/cmake/opencolorio.cmake @@ -32,10 +32,12 @@ set(OPENCOLORIO_EXTRA_ARGS ) if(APPLE) - # Work around issue where minizip-ng_LIBRARY assumes -ng in file name. set(OPENCOLORIO_EXTRA_ARGS ${OPENCOLORIO_EXTRA_ARGS} + # Work around issue where minizip-ng_LIBRARY assumes -ng in file name. -Dminizip_LIBRARY=${LIBDIR}/minizipng/lib/libminizip${LIBEXT} + # Work around issue where homebrew Imath's can be prioritized over our own dependency during linking if installed. + -DImath_LIBRARY=${LIBDIR}/imath/lib/libImath${SHAREDLIBEXT} ) endif() diff --git a/build_files/build_environment/cmake/tiff.cmake b/build_files/build_environment/cmake/tiff.cmake index d5593e4dce5..624182b0dbc 100644 --- a/build_files/build_environment/cmake/tiff.cmake +++ b/build_files/build_environment/cmake/tiff.cmake @@ -18,6 +18,14 @@ set(TIFF_EXTRA_ARGS -Dsphinx=OFF ) +if(APPLE) + set(TIFF_EXTRA_ARGS + ${TIFF_EXTRA_ARGS} + # Work around issue where homebrew's libdeflate can be prioritized over our own dependency during linking if installed. + -DDeflate_LIBRARY=${LIBDIR}/deflate/lib/libdeflate${LIBEXT} + ) +endif() + ExternalProject_Add(external_tiff URL file://${PACKAGE_DIR}/${TIFF_FILE} DOWNLOAD_DIR ${DOWNLOAD_DIR}