From c1aea353aec5e5070054ace630b1b2e4465238f3 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Wed, 26 Apr 2017 14:02:53 +0200 Subject: OSX buildbot: disable unsupported calls for now and use quicktime off default --- build_files/cmake/config/blender_full.cmake | 6 +++--- build_files/cmake/config/blender_release.cmake | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 87b8ed5f921..1acc48b48ab 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -75,8 +75,8 @@ elseif(APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) - set(WITH_CODEC_QUICKTIME ON 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..09e2faea08e 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -76,8 +76,8 @@ elseif(APPLE) set(WITH_JACK ON CACHE BOOL "" FORCE) set(WITH_CODEC_QUICKTIME ON CACHE BOOL "" FORCE) set(WITH_OPENSUBDIV OFF CACHE BOOL "" FORCE) - set(WITH_CODEC_QUICKTIME ON 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() -- cgit v1.2.3 From 87f483debb7bf2d866658ea9adcb61ad3583512a Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Wed, 26 Apr 2017 14:28:36 +0200 Subject: OSX buildbot: remove redundant option --- build_files/cmake/config/blender_full.cmake | 3 +-- build_files/cmake/config/blender_release.cmake | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'build_files') diff --git a/build_files/cmake/config/blender_full.cmake b/build_files/cmake/config/blender_full.cmake index 1acc48b48ab..ecde50ff156 100644 --- a/build_files/cmake/config/blender_full.cmake +++ b/build_files/cmake/config/blender_full.cmake @@ -73,9 +73,8 @@ 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() diff --git a/build_files/cmake/config/blender_release.cmake b/build_files/cmake/config/blender_release.cmake index 09e2faea08e..f7239559fb8 100644 --- a/build_files/cmake/config/blender_release.cmake +++ b/build_files/cmake/config/blender_release.cmake @@ -74,9 +74,8 @@ 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() -- cgit v1.2.3