diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-26 17:50:29 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-04-26 17:50:29 +0300 |
| commit | dc27d31a2100c3272d0dbf293b24131eacaab962 (patch) | |
| tree | 1b5349dbad4e520e0c6b874795ed63211f5f95ed /build_files | |
| parent | 7517cf6bbb989286f9a65b70ceae2e277e111e58 (diff) | |
| parent | 6ed15c5a41130b55cb57a43a8a9470a91d38c3d5 (diff) | |
Merge commit 'master@6ed15c5a41130b55cb57a43a8a9470a91d38c3d5' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
Diffstat (limited to 'build_files')
| -rw-r--r-- | build_files/cmake/config/blender_full.cmake | 7 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_release.cmake | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 87b8ed5f921..ecde50ff156 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -73,10 +73,9 @@ elseif(WIN32) endif() elseif(APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) - set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) + set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) - set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) - include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") - apple_check_quicktime() +# include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") +# apple_check_quicktime() endif() diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index b60c8c7380c..f7239559fb8 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -74,10 +74,9 @@ elseif(WIN32) endif() elseif(APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) - set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) + set(WITH_CODEC_QUICKTIME OFF CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) - set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) - include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") - apple_check_quicktime() +# include("${CMAKE_CURRENT_SOURCE_DIR}/../platform/platform_apple_xcode.cmake") +# apple_check_quicktime() endif() |