diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 14:09:41 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-10-24 18:52:20 +0300 |
| commit | fe253389e027c2da3a0d4ad7304f360be64e27e5 (patch) | |
| tree | fb5ad4c782afa2dd39726002ab87e4f0887bd7f9 /build_files | |
| parent | ec49503a3352c5d431bf54e35118222c3c4fd923 (diff) | |
Fix Cycles gtests build on macOS.
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
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) |