diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 09:03:31 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 09:03:31 +0300 |
commit | 45af6b61d9e2760409d642ddc19b51e6aa42481d (patch) | |
tree | ccb7162a85a8e451203c212ddf52b5458bc79a06 /build_files/cmake/platform/platform_apple.cmake | |
parent | 0117a4c351e59711eaea314db3315db0a57c01ee (diff) | |
parent | 0276e0e7de4a2164c95d5b167d245d2515991dc4 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake/platform/platform_apple.cmake')
-rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index c2c2efd0fc9..d3267a09aff 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -87,8 +87,8 @@ if(WITH_CODEC_SNDFILE) endif() if(WITH_PYTHON) - # we use precompiled libraries for py 3.5 and up by default - set(PYTHON_VERSION 3.6) + # we use precompiled libraries for py 3.7 and up by default + set(PYTHON_VERSION 3.7) if(NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK) # normally cached but not since we include them with blender set(PYTHON_INCLUDE_DIR "${LIBDIR}/python/include/python${PYTHON_VERSION}m") @@ -144,13 +144,12 @@ if(WITH_IMAGE_OPENEXR) set(OPENEXR ${LIBDIR}/openexr) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include) set(OPENEXR_INCLUDE_DIRS ${OPENEXR_INCLUDE_DIR} ${OPENEXR}/include/OpenEXR) - set(OPENEXR_POSTFIX -2_2) set(OPENEXR_LIBRARIES - Iex${OPENEXR_POSTFIX} + Iex Half - IlmImf${OPENEXR_POSTFIX} - Imath${OPENEXR_POSTFIX} - IlmThread${OPENEXR_POSTFIX}) + IlmImf + Imath + IlmThread) set(OPENEXR_LIBPATH ${OPENEXR}/lib) endif() @@ -159,12 +158,10 @@ if(WITH_CODEC_FFMPEG) set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil - mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg - ) - # commenting out until libs are updated on svn. schroedinger and orc - # will be removed then - # set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} vpx webp swresample) - set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} schroedinger orc vpx webp swresample) + mp3lame swscale x264 xvidcore + theora theoradec theoraenc + vorbis vorbisenc vorbisfile ogg + vpx swresample) set(FFMPEG_LIBPATH ${FFMPEG}/lib) endif() @@ -173,9 +170,7 @@ if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG) set(OPENJPEG ${LIBDIR}/openjpeg) set(WITH_SYSTEM_OPENJPEG ON) set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include) - # same as with ffmpeg libs, update when svn are updated - #set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a) - set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjpeg.a) + set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a) endif() find_library(SYSTEMSTUBS_LIBRARY @@ -223,17 +218,14 @@ if(WITH_OPENCOLLADA) -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser - -lxml2 -lbuffer -lftoa + -lbuffer -lftoa -lUTF + ${OPENCOLLADA_LIBPATH}/libxml2.a ) - # Use UTF functions from collada if LLVM is not enabled - if(NOT WITH_LLVM) - list(APPEND OPENCOLLADA_LIBRARIES -lUTF) - endif() - # pcre is bundled with openCollada + # PCRE is bundled with openCollada #set(PCRE ${LIBDIR}/pcre) #set(PCRE_LIBPATH ${PCRE}/lib) set(PCRE_LIBRARIES pcre) - #libxml2 is used + # libxml2 is used #set(EXPAT ${LIBDIR}/expat) #set(EXPAT_LIBPATH ${EXPAT}/lib) set(EXPAT_LIB) @@ -303,7 +295,6 @@ if(WITH_OPENIMAGEIO) ${OPENJPEG_LIBRARIES} ${ZLIB_LIBRARIES} ) - set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${LIBDIR}/ffmpeg/lib/libwebp.a) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib ${JPEG_LIBPATH} |