Fix Cycles gtests build on macOS.
[blender.git] / build_files / cmake / platform / platform_apple.cmake
index a08f94e5ec0dd2097fbece8639b36000ba45eb31..fcdebbb74adb24a5d136043898c1a57287f4339f 100644 (file)
@@ -161,7 +161,7 @@ if(WITH_CODEC_FFMPEG)
        set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 endif()
 
        set(FFMPEG_LIBPATH ${FFMPEG}/lib)
 endif()
 
-if(WITH_OPENJPEG OR WITH_CODEC_FFMPEG)
+if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG)
        # use openjpeg from libdir that is linked into ffmpeg
        set(OPENJPEG ${LIBDIR}/openjpeg)
        set(WITH_SYSTEM_OPENJPEG ON)
        # use openjpeg from libdir that is linked into ffmpeg
        set(OPENJPEG ${LIBDIR}/openjpeg)
        set(WITH_SYSTEM_OPENJPEG ON)
@@ -291,6 +291,7 @@ if(WITH_OPENIMAGEIO)
                ${JPEG_LIBRARIES}
                ${TIFF_LIBRARY}
                ${OPENEXR_LIBRARIES}
                ${JPEG_LIBRARIES}
                ${TIFF_LIBRARY}
                ${OPENEXR_LIBRARIES}
+               ${OPENJPEG_LIBRARIES}
                ${ZLIB_LIBRARIES}
        )
        set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a)
                ${ZLIB_LIBRARIES}
        )
        set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a)