diff options
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 3 | ||||
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 10 |
2 files changed, 8 insertions, 5 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) diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index f4213c508fc..f3e49dc0c4e 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -42,10 +42,12 @@ if(WITH_CYCLES_OSL) ${LLVM_LIBRARIES} ) endif() -if(WITH_IMAGE_OPENJPEG AND NOT WITH_SYSTEM_OPENJPEG) - list(APPEND ALL_CYCLES_LIBRARIES - extern_openjpeg - ) +if(WITH_IMAGE_OPENJPEG) + if(WITH_SYSTEM_OPENJPEG) + list(APPEND ALL_CYCLES_LIBRARIES ${OPENJPEG_LIBRARIES}) + else() + list(APPEND ALL_CYCLES_LIBRARIES extern_openjpeg) + endif() endif() if(WITH_CYCLES_OPENSUBDIV) add_definitions(-DWITH_OPENSUBDIV) |