From fe253389e027c2da3a0d4ad7304f360be64e27e5 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 24 Oct 2017 13:09:41 +0200 Subject: Fix Cycles gtests build on macOS. --- build_files/cmake/platform/platform_apple.cmake | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'build_files') diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index a08f94e5ec0..fcdebbb74ad 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -161,7 +161,7 @@ if(WITH_CODEC_FFMPEG) 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) @@ -291,6 +291,7 @@ if(WITH_OPENIMAGEIO) ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} + ${OPENJPEG_LIBRARIES} ${ZLIB_LIBRARIES} ) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a) -- cgit v1.2.3