Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles gtests build on macOS.

Browse Source
This commit is contained in:
Brecht Van Lommel
2017-10-24 13:09:41 +02:00
parent ec49503a33
commit fe253389e0
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
build_files/cmake/platform/platform_apple.cmake
View File

@@ -161,7 +161,7 @@ if(WITH_CODEC_FFMPEG)
set(FFMPEG_LIBPATH ${FFMPEG}/lib) set(FFMPEG_LIBPATH ${FFMPEG}/lib)
endif() 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 # use openjpeg from libdir that is linked into ffmpeg
set(OPENJPEG ${LIBDIR}/openjpeg) set(OPENJPEG ${LIBDIR}/openjpeg)
set(WITH_SYSTEM_OPENJPEG ON) set(WITH_SYSTEM_OPENJPEG ON)
@@ -291,6 +291,7 @@ if(WITH_OPENIMAGEIO)
${JPEG_LIBRARIES} ${JPEG_LIBRARIES}
${TIFF_LIBRARY} ${TIFF_LIBRARY}
${OPENEXR_LIBRARIES} ${OPENEXR_LIBRARIES}
${OPENJPEG_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES}
) )
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a)

10
intern/cycles/test/CMakeLists.txt
View File

@@ -42,10 +42,12 @@ if(WITH_CYCLES_OSL)
${LLVM_LIBRARIES} ${LLVM_LIBRARIES}
) )
endif() endif()
if(WITH_IMAGE_OPENJPEG AND NOT WITH_SYSTEM_OPENJPEG) if(WITH_IMAGE_OPENJPEG)
list(APPEND ALL_CYCLES_LIBRARIES if(WITH_SYSTEM_OPENJPEG)
extern_openjpeg list(APPEND ALL_CYCLES_LIBRARIES ${OPENJPEG_LIBRARIES})
) else()
list(APPEND ALL_CYCLES_LIBRARIES extern_openjpeg)
endif()
endif() endif()
if(WITH_CYCLES_OPENSUBDIV) if(WITH_CYCLES_OPENSUBDIV)
add_definitions(-DWITH_OPENSUBDIV) add_definitions(-DWITH_OPENSUBDIV)