diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 11:13:35 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-10-25 11:13:35 +0300 |
| commit | 1e107fa5143ad340176b1a84ceb43c8b00532eca (patch) | |
| tree | 58bec6266e0f211d7ef7cd4e55af7fb59aa8c3da /build_files | |
| parent | 8dab90915f37b01e7d0da59d06cadad23330897c (diff) | |
| parent | 83877632a37af921d94811f47798c65520974a92 (diff) | |
Merge branch 'master' into blender2.8
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 1494b296eb5..7e3f889b73f 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -163,7 +163,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) @@ -293,6 +293,7 @@ if(WITH_OPENIMAGEIO) ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} + ${OPENJPEG_LIBRARIES} ${ZLIB_LIBRARIES} ) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a) |